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/d1_both.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

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

diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index fb7e289d96..0e4317653d 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_both.c,v 1.47 2017/01/26 10:40:21 beck Exp $ */
+/* $OpenBSD: d1_both.c,v 1.48 2017/01/26 12:16:13 beck Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -410,8 +410,7 @@ dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 		S3I(s)->tmp.reuse_message = 0;
 		if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) {
 			al = SSL_AD_UNEXPECTED_MESSAGE;
-			SSLerror(
-			    SSL_R_UNEXPECTED_MESSAGE);
+			SSLerror(SSL_R_UNEXPECTED_MESSAGE);
 			goto f_err;
 		}
 		*ok = 1;
@@ -476,14 +475,12 @@ dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr, int max)
 
 	/* sanity checking */
 	if ((frag_off + frag_len) > msg_len) {
-		SSLerror(
-		    SSL_R_EXCESSIVE_MESSAGE_SIZE);
+		SSLerror(SSL_R_EXCESSIVE_MESSAGE_SIZE);
 		return SSL_AD_ILLEGAL_PARAMETER;
 	}
 
 	if ((frag_off + frag_len) > (unsigned long)max) {
-		SSLerror(
-		    SSL_R_EXCESSIVE_MESSAGE_SIZE);
+		SSLerror(SSL_R_EXCESSIVE_MESSAGE_SIZE);
 		return SSL_AD_ILLEGAL_PARAMETER;
 	}
 
@@ -509,8 +506,7 @@ dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr, int max)
 		 * They must be playing with us! BTW, failure to enforce
 		 * upper limit would open possibility for buffer overrun.
 		 */
-		SSLerror(
-		    SSL_R_EXCESSIVE_MESSAGE_SIZE);
+		SSLerror(SSL_R_EXCESSIVE_MESSAGE_SIZE);
 		return SSL_AD_ILLEGAL_PARAMETER;
 	}
 
@@ -803,8 +799,7 @@ again:
 	    /* parse the message fragment header */
 	    dtls1_get_message_header(wire, &msg_hdr) == 0) {
 		al = SSL_AD_UNEXPECTED_MESSAGE;
-		SSLerror(
-		    SSL_R_UNEXPECTED_MESSAGE);
+		SSLerror(SSL_R_UNEXPECTED_MESSAGE);
 		goto f_err;
 	}
 
@@ -846,8 +841,7 @@ again:
 		else /* Incorrectly formated Hello request */
 		{
 			al = SSL_AD_UNEXPECTED_MESSAGE;
-			SSLerror(
-			    SSL_R_UNEXPECTED_MESSAGE);
+			SSLerror(SSL_R_UNEXPECTED_MESSAGE);
 			goto f_err;
 		}
 	}
@@ -878,8 +872,7 @@ again:
 	 */
 	if (i != (int)frag_len) {
 		al = SSL3_AD_ILLEGAL_PARAMETER;
-		SSLerror(
-		    SSL3_AD_ILLEGAL_PARAMETER);
+		SSLerror(SSL3_AD_ILLEGAL_PARAMETER);
 		goto f_err;
 	}
 
-- 
cgit v1.2.3-55-g6feb