summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_err.c
diff options
context:
space:
mode:
authorbeck <>2017-01-26 07:20:57 +0000
committerbeck <>2017-01-26 07:20:57 +0000
commit698e7d8ee2f7d9cae52e8401e27ba90fcb092eac (patch)
tree7084b69c15aff2f1f2fea63626df9a5f51b4cb83 /src/lib/libssl/ssl_err.c
parent4de695d1426ee408ccc05e0ca11e2085918a4e6a (diff)
downloadopenbsd-698e7d8ee2f7d9cae52e8401e27ba90fcb092eac.tar.gz
openbsd-698e7d8ee2f7d9cae52e8401e27ba90fcb092eac.tar.bz2
openbsd-698e7d8ee2f7d9cae52e8401e27ba90fcb092eac.zip
Limit the number of sequential empty records that we will process
before yielding, and fail if we exceed a maximum. loosely based on what boring and openssl are doing ok jsing@
Diffstat (limited to 'src/lib/libssl/ssl_err.c')
-rw-r--r--src/lib/libssl/ssl_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index 04742b60ca..efe3e9473f 100644
--- a/src/lib/libssl/ssl_err.c
+++ b/src/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_err.c,v 1.29 2015/02/22 15:54:27 jsing Exp $ */ 1/* $OpenBSD: ssl_err.c,v 1.30 2017/01/26 07:20:57 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -597,6 +597,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {
597 {ERR_REASON(SSL_R_WRONG_VERSION_NUMBER) , "wrong version number"}, 597 {ERR_REASON(SSL_R_WRONG_VERSION_NUMBER) , "wrong version number"},
598 {ERR_REASON(SSL_R_X509_LIB) , "x509 lib"}, 598 {ERR_REASON(SSL_R_X509_LIB) , "x509 lib"},
599 {ERR_REASON(SSL_R_X509_VERIFICATION_SETUP_PROBLEMS), "x509 verification setup problems"}, 599 {ERR_REASON(SSL_R_X509_VERIFICATION_SETUP_PROBLEMS), "x509 verification setup problems"},
600 {ERR_REASON(SSL_R_PEER_BEHAVING_BADLY) ,"peer is doing strange or hostile things"},
600 {0, NULL} 601 {0, NULL}
601}; 602};
602 603