diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-19 08:37:18 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-20 09:39:11 +0100 |
| commit | 276d6c687a89f90c096faf8918681d04a0cea7cf (patch) | |
| tree | 916e12f61a1bbeec06ac6ac683d34e3b5d0ac81a | |
| parent | Fix crash in genpkey app when -pkeyopt digest:name is used for DH or DSA. (diff) | |
| download | openssl-276d6c687a89f90c096faf8918681d04a0cea7cf.tar.xz openssl-276d6c687a89f90c096faf8918681d04a0cea7cf.zip | |
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)
| -rw-r--r-- | ssl/d1_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 5ecf1d19fa..bd50ee6d9c 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 bb0eec9b5f..09702e81c3 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; } |