diff options
author | Rich Salz <rsalz@akamai.com> | 2019-05-31 13:52:45 -0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-07-16 05:26:28 +0200 |
commit | aac96e2797c34a6b2a839eb58c30ab3328a0cee8 (patch) | |
tree | 105434e5b948326f7846dce7a9a8fb7ff41974e6 /ssl | |
parent | 3d9b33b5e48d82d098a1f8c37dbf616a0d84621c (diff) |
Remove function name from errors
Deprecate all xxx_F_ defines.
Removed some places that tested for a specific function.
Use empty field for the function names in output.
Update documentation.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9058)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/d1_lib.c | 2 | ||||
-rw-r--r-- | ssl/statem/statem.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index d3f681ba41..01955d7b4f 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -378,7 +378,7 @@ int dtls1_check_timeout_num(SSL *s) if (s->d1->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT) { /* fail the connection, enough alerts have been sent */ - SSLfatal(s, SSL_AD_NO_ALERT, SSL_F_DTLS1_CHECK_TIMEOUT_NUM, + SSLfatal(s, SSL_AD_NO_ALERT, 0, SSL_R_READ_TIMEOUT_EXPIRED); return -1; } diff --git a/ssl/statem/statem.h b/ssl/statem/statem.h index e26a5be0e2..a9309c967d 100644 --- a/ssl/statem/statem.h +++ b/ssl/statem/statem.h @@ -136,10 +136,10 @@ void ossl_statem_fatal(SSL *s, int al, int func, int reason, const char *file, int line); # define SSL_AD_NO_ALERT -1 # ifndef OPENSSL_NO_ERR -# define SSLfatal(s, al, f, r) ossl_statem_fatal((s), (al), (f), (r), \ +# define SSLfatal(s, al, f, r) ossl_statem_fatal((s), (al), (0), (r), \ OPENSSL_FILE, OPENSSL_LINE) # else -# define SSLfatal(s, al, f, r) ossl_statem_fatal((s), (al), (f), (r), NULL, 0) +# define SSLfatal(s, al, f, r) ossl_statem_fatal((s), (al), (0), (r), NULL, 0) # endif int ossl_statem_in_error(const SSL *s); |