summaryrefslogtreecommitdiff
path: root/ssl/ssl_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-06-15 17:25:15 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-06-15 17:25:15 +0000
commite97359435ee15e6d2c0580c76a58040e8dc3ce60 (patch)
tree01c3ecc781efc58b6efb927129cdfe511644a3d5 /ssl/ssl_lib.c
parentafce9bcca15bbf4a015d3f678cec5501ca1092eb (diff)
downloadopenssl-new-e97359435ee15e6d2c0580c76a58040e8dc3ce60.tar.gz
Fix warnings (From HEAD, original patch by Ben).
Diffstat (limited to 'ssl/ssl_lib.c')
-rw-r--r--ssl/ssl_lib.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 3157f20eac..912592b8bb 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2110,23 +2110,12 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
/* THIS NEEDS CLEANING UP */
X509 *ssl_get_server_send_cert(SSL *s)
{
- unsigned long alg_k,alg_a,mask_k,mask_a;
+ unsigned long alg_k,alg_a;
CERT *c;
- int i,is_export;
+ int i;
c=s->cert;
ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
- is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
- if (is_export)
- {
- mask_k = c->export_mask_k;
- mask_a = c->export_mask_a;
- }
- else
- {
- mask_k = c->mask_k;
- mask_a = c->mask_a;
- }
alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
alg_a = s->s3->tmp.new_cipher->algorithm_auth;