From 5ae189b08474853c519a12e66db1c17cfc3c9c8f Mon Sep 17 00:00:00 2001 From: beck <> Date: Thu, 26 Jan 2017 12:16:13 +0000 Subject: Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly line wraps that resulted --- src/lib/libssl/t1_lib.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'src/lib/libssl/t1_lib.c') diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index b3e86c0a31..2e9d31112d 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.113 2017/01/26 10:40:21 beck Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.114 2017/01/26 12:16:13 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -742,8 +742,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) int el; if (!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -754,8 +753,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) s2n(el, ret); if (!ssl_add_clienthello_renegotiate_ext(s, ret, &el, el)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -780,8 +778,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) if (formatslen > lenmax) return NULL; if (formatslen > 255) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -803,8 +800,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) if (curveslen * 2 > lenmax) return NULL; if (curveslen * 2 > 65532) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -946,8 +942,7 @@ skip_ext: s2n(el, ret); if (ssl_add_clienthello_use_srtp_ext(s, ret, &el, el)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } ret += el; @@ -1025,8 +1020,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) int el; if (!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -1037,8 +1031,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) s2n(el, ret); if (!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -1061,8 +1054,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) if (formatslen > lenmax) return NULL; if (formatslen > 255) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } @@ -1108,8 +1100,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) s2n(el, ret); if (ssl_add_serverhello_use_srtp_ext(s, ret, &el, el)) { - SSLerror( - ERR_R_INTERNAL_ERROR); + SSLerror(ERR_R_INTERNAL_ERROR); return NULL; } ret += el; @@ -1627,8 +1618,7 @@ ri_check: if (!renegotiate_seen && s->internal->renegotiate) { *al = SSL_AD_HANDSHAKE_FAILURE; - SSLerror( - SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); + SSLerror(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); return 0; } @@ -1880,8 +1870,7 @@ ri_check: if (!renegotiate_seen && !(s->internal->options & SSL_OP_LEGACY_SERVER_CONNECT)) { *al = SSL_AD_HANDSHAKE_FAILURE; - SSLerror( - SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); + SSLerror(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); return 0; } -- cgit v1.2.3-55-g6feb