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_reneg.c | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'src/lib/libssl/t1_reneg.c')

diff --git a/src/lib/libssl/t1_reneg.c b/src/lib/libssl/t1_reneg.c
index ea432554b0..596b96edd3 100644
--- a/src/lib/libssl/t1_reneg.c
+++ b/src/lib/libssl/t1_reneg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_reneg.c,v 1.13 2017/01/26 10:40:21 beck Exp $ */
+/* $OpenBSD: t1_reneg.c,v 1.14 2017/01/26 12:16:13 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,8 +123,7 @@ ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 {
 	if (p) {
 		if ((S3I(s)->previous_client_finished_len + 1) > maxlen) {
-			SSLerror(
-			    SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+			SSLerror(SSL_R_RENEGOTIATE_EXT_TOO_LONG);
 			return 0;
 		}
 
@@ -151,8 +150,7 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, const unsigned char *d, int len,
 	CBS cbs, reneg;
 
 	if (len < 0) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_ENCODING_ERR);
+		SSLerror(SSL_R_RENEGOTIATION_ENCODING_ERR);
 		*al = SSL_AD_ILLEGAL_PARAMETER;
 		return 0;
 	}
@@ -161,24 +159,21 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, const unsigned char *d, int len,
 	if (!CBS_get_u8_length_prefixed(&cbs, &reneg) ||
 	    /* Consistency check */
 	    CBS_len(&cbs) != 0) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_ENCODING_ERR);
+		SSLerror(SSL_R_RENEGOTIATION_ENCODING_ERR);
 		*al = SSL_AD_ILLEGAL_PARAMETER;
 		return 0;
 	}
 
 	/* Check that the extension matches */
 	if (CBS_len(&reneg) != S3I(s)->previous_client_finished_len) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_MISMATCH);
+		SSLerror(SSL_R_RENEGOTIATION_MISMATCH);
 		*al = SSL_AD_HANDSHAKE_FAILURE;
 		return 0;
 	}
 
 	if (!CBS_mem_equal(&reneg, S3I(s)->previous_client_finished,
 	    S3I(s)->previous_client_finished_len)) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_MISMATCH);
+		SSLerror(SSL_R_RENEGOTIATION_MISMATCH);
 		*al = SSL_AD_HANDSHAKE_FAILURE;
 		return 0;
 	}
@@ -196,8 +191,7 @@ ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 	if (p) {
 		if ((S3I(s)->previous_client_finished_len +
 		    S3I(s)->previous_server_finished_len + 1) > maxlen) {
-			SSLerror(
-			    SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+			SSLerror(SSL_R_RENEGOTIATE_EXT_TOO_LONG);
 			return 0;
 		}
 
@@ -235,8 +229,7 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, const unsigned char *d, int len, i
 	OPENSSL_assert(!expected_len || S3I(s)->previous_server_finished_len);
 
 	if (len < 0) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_ENCODING_ERR);
+		SSLerror(SSL_R_RENEGOTIATION_ENCODING_ERR);
 		*al = SSL_AD_ILLEGAL_PARAMETER;
 		return 0;
 	}
@@ -246,8 +239,7 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, const unsigned char *d, int len, i
 	if (!CBS_get_u8_length_prefixed(&cbs, &reneg) ||
 	    /* Consistency check */
 	    CBS_len(&cbs) != 0) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_ENCODING_ERR);
+		SSLerror(SSL_R_RENEGOTIATION_ENCODING_ERR);
 		*al = SSL_AD_ILLEGAL_PARAMETER;
 		return 0;
 	}
@@ -259,23 +251,20 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, const unsigned char *d, int len, i
 	    !CBS_get_bytes(&reneg, &previous_server,
 	    S3I(s)->previous_server_finished_len) ||
 	    CBS_len(&reneg) != 0) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_MISMATCH);
+		SSLerror(SSL_R_RENEGOTIATION_MISMATCH);
 		*al = SSL_AD_HANDSHAKE_FAILURE;
 		return 0;
 	}
 
 	if (!CBS_mem_equal(&previous_client, S3I(s)->previous_client_finished,
 	    CBS_len(&previous_client))) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_MISMATCH);
+		SSLerror(SSL_R_RENEGOTIATION_MISMATCH);
 		*al = SSL_AD_HANDSHAKE_FAILURE;
 		return 0;
 	}
 	if (!CBS_mem_equal(&previous_server, S3I(s)->previous_server_finished,
 	    CBS_len(&previous_server))) {
-		SSLerror(
-		    SSL_R_RENEGOTIATION_MISMATCH);
+		SSLerror(SSL_R_RENEGOTIATION_MISMATCH);
 		*al = SSL_AD_ILLEGAL_PARAMETER;
 		return 0;
 	}
-- 
cgit v1.2.3-55-g6feb