diff options
Diffstat (limited to 'src/lib/libssl/ssl_ciphers.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciphers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciphers.c b/src/lib/libssl/ssl_ciphers.c index f77f32ab7f..09b4805820 100644 --- a/src/lib/libssl/ssl_ciphers.c +++ b/src/lib/libssl/ssl_ciphers.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciphers.c,v 1.15 2022/07/02 16:31:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl_ciphers.c,v 1.16 2022/10/02 16:36:41 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2015-2017 Doug Hogan <doug@openbsd.org> | 3 | * Copyright (c) 2015-2017 Doug Hogan <doug@openbsd.org> |
| 4 | * Copyright (c) 2015-2018, 2020 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2015-2018, 2020 Joel Sing <jsing@openbsd.org> |
| @@ -79,7 +79,7 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *ciphers, CBB *cbb) | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | /* Add SCSV if there are other ciphers and we're not renegotiating. */ | 81 | /* Add SCSV if there are other ciphers and we're not renegotiating. */ |
| 82 | if (num_ciphers > 0 && !s->internal->renegotiate) { | 82 | if (num_ciphers > 0 && !s->renegotiate) { |
| 83 | if (!CBB_add_u16(cbb, SSL3_CK_SCSV & SSL3_CK_VALUE_MASK)) | 83 | if (!CBB_add_u16(cbb, SSL3_CK_SCSV & SSL3_CK_VALUE_MASK)) |
| 84 | return 0; | 84 | return 0; |
| 85 | } | 85 | } |
| @@ -118,7 +118,7 @@ ssl_bytes_to_cipher_list(SSL *s, CBS *cbs) | |||
| 118 | * TLS_EMPTY_RENEGOTIATION_INFO_SCSV is fatal if | 118 | * TLS_EMPTY_RENEGOTIATION_INFO_SCSV is fatal if |
| 119 | * renegotiating. | 119 | * renegotiating. |
| 120 | */ | 120 | */ |
| 121 | if (s->internal->renegotiate) { | 121 | if (s->renegotiate) { |
| 122 | SSLerror(s, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING); | 122 | SSLerror(s, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING); |
| 123 | ssl3_send_alert(s, SSL3_AL_FATAL, | 123 | ssl3_send_alert(s, SSL3_AL_FATAL, |
| 124 | SSL_AD_HANDSHAKE_FAILURE); | 124 | SSL_AD_HANDSHAKE_FAILURE); |
