From: Richard Levitte <levitte@openssl.org>
Date: Thu, 19 Nov 2020 07:37:18 +0000 (+0100)
Subject: SSL: Change SSLerr() to ERR_raise()
X-Git-Tag: openssl-3.0.0-alpha9~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=276d6c687a89f90c096faf8918681d04a0cea7cf;p=thirdparty%2Fopenssl.git

SSL: Change SSLerr() to ERR_raise()

This was probably due to a merge

Fixes #13449

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/13450)
---

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 5ecf1d19fa9..bd50ee6d9ce 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -487,7 +487,7 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client)
     }
 
     if (!ssl3_setup_buffers(s)) {
-        /* SSLerr already called */
+        /* ERR_raise() already called */
         return -1;
     }
     buf = RECORD_LAYER_get_rbuf(&s->rlayer)->buf;
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index bb0eec9b5f5..09702e81c32 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -5960,7 +5960,7 @@ int SSL_set0_tmp_dh_pkey(SSL *s, EVP_PKEY *dhpkey)
 {
     if (!ssl_security(s, SSL_SECOP_TMP_DH,
                       EVP_PKEY_security_bits(dhpkey), 0, dhpkey)) {
-        SSLerr(0, SSL_R_DH_KEY_TOO_SMALL);
+        ERR_raise(ERR_LIB_SSL, SSL_R_DH_KEY_TOO_SMALL);
         EVP_PKEY_free(dhpkey);
         return 0;
     }
@@ -5973,7 +5973,7 @@ int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey)
 {
     if (!ssl_ctx_security(ctx, SSL_SECOP_TMP_DH,
                           EVP_PKEY_security_bits(dhpkey), 0, dhpkey)) {
-        SSLerr(0, SSL_R_DH_KEY_TOO_SMALL);
+        ERR_raise(ERR_LIB_SSL, SSL_R_DH_KEY_TOO_SMALL);
         EVP_PKEY_free(dhpkey);
         return 0;
     }