diff options
| author | Ben Laurie <ben@openssl.org> | 2010-06-12 13:18:58 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2010-06-12 13:18:58 +0000 |
| commit | d886975835e7e430aeda6ecb1653363b463bc9cf (patch) | |
| tree | 03ec369d422a0585dc36abb091a4d96ed90e128f /ssl/ssl_lib.c | |
| parent | 22872a536328f52f3cbed8607107d7afbc8881f0 (diff) | |
Fix gcc 4.6 warnings. Check TLS server hello extension length.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 15650da5e7..b6b8e6038a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1940,15 +1940,13 @@ int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs) /* THIS NEEDS CLEANING UP */ X509 *ssl_get_server_send_cert(SSL *s) { - unsigned long alg,mask,kalg; + unsigned long alg,kalg; CERT *c; - int i,is_export; + int i; c=s->cert; ssl_set_cert_masks(c, s->s3->tmp.new_cipher); alg=s->s3->tmp.new_cipher->algorithms; - is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher); - mask=is_export?c->export_mask:c->mask; kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK); if (kalg & SSL_kECDH) |