diff options
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r-- | src/lib/libssl/s3_srvr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 574910cda6..597ddd4310 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_srvr.c,v 1.81 2014/08/11 04:46:42 miod Exp $ */ | 1 | /* $OpenBSD: s3_srvr.c,v 1.82 2014/08/24 14:36:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1250,8 +1250,8 @@ ssl3_send_server_hello(SSL *s) | |||
1250 | { | 1250 | { |
1251 | unsigned char *buf; | 1251 | unsigned char *buf; |
1252 | unsigned char *p, *d; | 1252 | unsigned char *p, *d; |
1253 | int i, sl; | ||
1254 | unsigned long l; | 1253 | unsigned long l; |
1254 | int sl; | ||
1255 | 1255 | ||
1256 | if (s->state == SSL3_ST_SW_SRVR_HELLO_A) { | 1256 | if (s->state == SSL3_ST_SW_SRVR_HELLO_A) { |
1257 | buf = (unsigned char *)s->init_buf->data; | 1257 | buf = (unsigned char *)s->init_buf->data; |
@@ -1298,8 +1298,7 @@ ssl3_send_server_hello(SSL *s) | |||
1298 | p += sl; | 1298 | p += sl; |
1299 | 1299 | ||
1300 | /* put the cipher */ | 1300 | /* put the cipher */ |
1301 | i = ssl3_put_cipher_by_char(s->s3->tmp.new_cipher, p); | 1301 | s2n(ssl3_cipher_get_value(s->s3->tmp.new_cipher), p); |
1302 | p += i; | ||
1303 | 1302 | ||
1304 | /* put the compression method */ | 1303 | /* put the compression method */ |
1305 | *(p++) = 0; | 1304 | *(p++) = 0; |