summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-09-22 14:59:48 +0000
committertb <>2024-09-22 14:59:48 +0000
commit9de203af454d6aa361ffccd10b1fa6cf3179d821 (patch)
tree0b3c28b3b969f17e77b41fd2ba84c7865b6d1b07
parent125bc1817697d366947ffe79f9f64bd06b69bafa (diff)
downloadopenbsd-9de203af454d6aa361ffccd10b1fa6cf3179d821.tar.gz
openbsd-9de203af454d6aa361ffccd10b1fa6cf3179d821.tar.bz2
openbsd-9de203af454d6aa361ffccd10b1fa6cf3179d821.zip
Reinstate bounds check accidentally disabled when defining OPENSSL_NO_DTLS1
From Kenjiro Nakayama Closes https://github.com/libressl/portable/issues/1097
-rw-r--r--src/lib/libssl/ssl_lib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 1a2bf36952..63d72baf8e 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.329 2024/08/03 04:50:27 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.330 2024/09/22 14:59:48 tb 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 *
@@ -1372,10 +1372,8 @@ SSL_ctrl(SSL *s, int cmd, long larg, void *parg)
1372 s->max_cert_list = larg; 1372 s->max_cert_list = larg;
1373 return (l); 1373 return (l);
1374 case SSL_CTRL_SET_MTU: 1374 case SSL_CTRL_SET_MTU:
1375#ifndef OPENSSL_NO_DTLS1
1376 if (larg < (long)dtls1_min_mtu()) 1375 if (larg < (long)dtls1_min_mtu())
1377 return (0); 1376 return (0);
1378#endif
1379 if (SSL_is_dtls(s)) { 1377 if (SSL_is_dtls(s)) {
1380 s->d1->mtu = larg; 1378 s->d1->mtu = larg;
1381 return (larg); 1379 return (larg);