diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 8e7b1b5167..00af9778ad 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.105 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.106 2017/01/23 14:35:42 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 | * |
@@ -435,7 +435,7 @@ tls1_get_shared_curve(SSL *s) | |||
435 | return (NID_undef); | 435 | return (NID_undef); |
436 | 436 | ||
437 | /* Return first preference shared curve. */ | 437 | /* Return first preference shared curve. */ |
438 | server_pref = (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE); | 438 | server_pref = (s->internal->options & SSL_OP_CIPHER_SERVER_PREFERENCE); |
439 | tls1_get_curvelist(s, (server_pref == 0), &pref, &preflen); | 439 | tls1_get_curvelist(s, (server_pref == 0), &pref, &preflen); |
440 | tls1_get_curvelist(s, (server_pref != 0), &supp, &supplen); | 440 | tls1_get_curvelist(s, (server_pref != 0), &supp, &supplen); |
441 | 441 | ||
@@ -916,7 +916,7 @@ skip_ext: | |||
916 | * NB: because this code works out the length of all existing | 916 | * NB: because this code works out the length of all existing |
917 | * extensions it MUST always appear last. | 917 | * extensions it MUST always appear last. |
918 | */ | 918 | */ |
919 | if (s->options & SSL_OP_TLSEXT_PADDING) { | 919 | if (s->internal->options & SSL_OP_TLSEXT_PADDING) { |
920 | int hlen = ret - (unsigned char *)s->internal->init_buf->data; | 920 | int hlen = ret - (unsigned char *)s->internal->init_buf->data; |
921 | 921 | ||
922 | /* | 922 | /* |
@@ -1832,7 +1832,8 @@ ri_check: | |||
1832 | * which doesn't support RI so for the immediate future tolerate RI | 1832 | * which doesn't support RI so for the immediate future tolerate RI |
1833 | * absence on initial connect only. | 1833 | * absence on initial connect only. |
1834 | */ | 1834 | */ |
1835 | if (!renegotiate_seen && !(s->options & SSL_OP_LEGACY_SERVER_CONNECT)) { | 1835 | if (!renegotiate_seen && |
1836 | !(s->internal->options & SSL_OP_LEGACY_SERVER_CONNECT)) { | ||
1836 | *al = SSL_AD_HANDSHAKE_FAILURE; | 1837 | *al = SSL_AD_HANDSHAKE_FAILURE; |
1837 | SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, | 1838 | SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, |
1838 | SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); | 1839 | SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); |