diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 63d72baf8e..ce68981493 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.330 2024/09/22 14:59:48 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.331 2025/03/12 14:03:55 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 | * |
| @@ -1308,6 +1308,11 @@ LSSL_ALIAS(SSL_shutdown); | |||
| 1308 | int | 1308 | int |
| 1309 | SSL_renegotiate(SSL *s) | 1309 | SSL_renegotiate(SSL *s) |
| 1310 | { | 1310 | { |
| 1311 | if ((s->options & SSL_OP_NO_RENEGOTIATION) != 0) { | ||
| 1312 | SSLerror(s, SSL_R_NO_RENEGOTIATION); | ||
| 1313 | return 0; | ||
| 1314 | } | ||
| 1315 | |||
| 1311 | if (s->renegotiate == 0) | 1316 | if (s->renegotiate == 0) |
| 1312 | s->renegotiate = 1; | 1317 | s->renegotiate = 1; |
| 1313 | 1318 | ||
| @@ -1320,6 +1325,11 @@ LSSL_ALIAS(SSL_renegotiate); | |||
| 1320 | int | 1325 | int |
| 1321 | SSL_renegotiate_abbreviated(SSL *s) | 1326 | SSL_renegotiate_abbreviated(SSL *s) |
| 1322 | { | 1327 | { |
| 1328 | if ((s->options & SSL_OP_NO_RENEGOTIATION) != 0) { | ||
| 1329 | SSLerror(s, SSL_R_NO_RENEGOTIATION); | ||
| 1330 | return 0; | ||
| 1331 | } | ||
| 1332 | |||
| 1323 | if (s->renegotiate == 0) | 1333 | if (s->renegotiate == 0) |
| 1324 | s->renegotiate = 1; | 1334 | s->renegotiate = 1; |
| 1325 | 1335 | ||
