diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index e5dedf0ba4..fad600a07e 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.82 2014/08/23 14:52:41 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.83 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 | * |
@@ -1384,7 +1384,8 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p) | |||
1384 | if ((c->algorithm_ssl & SSL_TLSV1_2) && | 1384 | if ((c->algorithm_ssl & SSL_TLSV1_2) && |
1385 | (TLS1_get_client_version(s) < TLS1_2_VERSION)) | 1385 | (TLS1_get_client_version(s) < TLS1_2_VERSION)) |
1386 | continue; | 1386 | continue; |
1387 | p += ssl3_put_cipher_by_char(c, p); | 1387 | |
1388 | s2n(ssl3_cipher_get_value(c), p); | ||
1388 | } | 1389 | } |
1389 | 1390 | ||
1390 | /* | 1391 | /* |
@@ -1395,7 +1396,7 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p) | |||
1395 | static SSL_CIPHER scsv = { | 1396 | static SSL_CIPHER scsv = { |
1396 | 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 | 1397 | 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 |
1397 | }; | 1398 | }; |
1398 | p += ssl3_put_cipher_by_char(&scsv, p); | 1399 | s2n(ssl3_cipher_get_value(&scsv), p); |
1399 | } | 1400 | } |
1400 | 1401 | ||
1401 | return (p - q); | 1402 | return (p - q); |