summaryrefslogtreecommitdiff
path: root/ssl/s23_lib.c
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
committerBen Laurie <ben@openssl.org>2010-06-12 13:18:58 +0000
commitd886975835e7e430aeda6ecb1653363b463bc9cf (patch)
tree03ec369d422a0585dc36abb091a4d96ed90e128f /ssl/s23_lib.c
parent22872a536328f52f3cbed8607107d7afbc8881f0 (diff)
downloadopenssl-new-d886975835e7e430aeda6ecb1653363b463bc9cf.tar.gz
Fix gcc 4.6 warnings. Check TLS server hello extension length.
Diffstat (limited to 'ssl/s23_lib.c')
-rw-r--r--ssl/s23_lib.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index fc2981308d..0b82777b2a 100644
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -97,14 +97,8 @@ SSL_CIPHER *ssl23_get_cipher(unsigned int u)
* available */
SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
{
- SSL_CIPHER c,*cp;
- unsigned long id;
- int n;
+ SSL_CIPHER *cp;
- n=ssl3_num_ciphers();
- id=0x03000000|((unsigned long)p[0]<<16L)|
- ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
- c.id=id;
cp=ssl3_get_cipher_by_char(p);
#ifndef OPENSSL_NO_SSL2
if (cp == NULL)