From 59161dbdf4da5b82b27402f93d7007a11b2d1cc1 Mon Sep 17 00:00:00 2001 From: beck <> Date: Thu, 26 Jan 2017 10:40:21 +0000 Subject: Send the error function codes to rot in the depths of hell where they belong We leave a single funciton code (0xFFF) to say "SSL_internal" so the public API will not break, and we replace all internal use of the two argument SSL_err() with the internal only SSL_error() that only takes a reason code. ok jsing@ --- src/lib/libssl/d1_srvr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/libssl/d1_srvr.c') diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index f36d3f40cd..80d7d639c3 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.81 2017/01/26 06:32:58 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.82 2017/01/26 10:40:21 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -202,7 +202,7 @@ dtls1_accept(SSL *s) D1I(s)->listen = listen; if (s->cert == NULL) { - SSLerr(SSL_F_DTLS1_ACCEPT, SSL_R_NO_CERTIFICATE_SET); + SSLerror(SSL_R_NO_CERTIFICATE_SET); ret = -1; goto end; } @@ -225,7 +225,7 @@ dtls1_accept(SSL *s) cb(s, SSL_CB_HANDSHAKE_START, 1); if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00)) { - SSLerr(SSL_F_DTLS1_ACCEPT, ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); ret = -1; goto end; } @@ -506,7 +506,7 @@ dtls1_accept(SSL *s) * at this point and digest cached records. */ if (!S3I(s)->handshake_buffer) { - SSLerr(SSL_F_SSL3_ACCEPT, + SSLerror( ERR_R_INTERNAL_ERROR); ret = -1; goto end; @@ -659,7 +659,7 @@ dtls1_accept(SSL *s) /* break; */ default: - SSLerr(SSL_F_DTLS1_ACCEPT, SSL_R_UNKNOWN_STATE); + SSLerror(SSL_R_UNKNOWN_STATE); ret = -1; goto end; /* break; */ @@ -706,7 +706,7 @@ dtls1_send_hello_verify_request(SSL *s) if (s->ctx->internal->app_gen_cookie_cb == NULL || s->ctx->internal->app_gen_cookie_cb(s, D1I(s)->cookie, &(D1I(s)->cookie_len)) == 0) { - SSLerr(SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST, + SSLerror( ERR_R_INTERNAL_ERROR); return 0; } -- cgit v1.2.3-55-g6feb