Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly

line wraps that resulted

1 files changed, 18 insertions, 35 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 6287f6cbc6..108cc9f71e 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.132 2017/01/26 10:40:21 beck Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.133 2017/01/26 12:16:13 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1980,8 +1980,7 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
 
         if (cmd == SSL_CTRL_SET_TMP_DH || cmd == SSL_CTRL_SET_TMP_DH_CB) {
                 if (!ssl_cert_inst(&s->cert)) {
-                        SSLerror(
-                            ERR_R_MALLOC_FAILURE);
+                        SSLerror(ERR_R_MALLOC_FAILURE);
                         return (0);
                 }
         }
@@ -2016,13 +2015,11 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                 {
                         DH *dh = (DH *)parg;
                         if (dh == NULL) {
-                                SSLerror(
-                                    ERR_R_PASSED_NULL_PARAMETER);
+                                SSLerror(ERR_R_PASSED_NULL_PARAMETER);
                                 return (ret);
                         }
                         if ((dh = DHparams_dup(dh)) == NULL) {
-                                SSLerror(
-                                    ERR_R_DH_LIB);
+                                SSLerror(ERR_R_DH_LIB);
                                 return (ret);
                         }
                         DH_free(s->cert->dh_tmp);
@@ -2044,21 +2041,18 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                         EC_KEY *ecdh = NULL;
 
                         if (parg == NULL) {
-                                SSLerror(
-                                    ERR_R_PASSED_NULL_PARAMETER);
+                                SSLerror(ERR_R_PASSED_NULL_PARAMETER);
                                 return (ret);
                         }
                         if (!EC_KEY_up_ref((EC_KEY *)parg)) {
-                                SSLerror(
-                                    ERR_R_ECDH_LIB);
+                                SSLerror(ERR_R_ECDH_LIB);
                                 return (ret);
                         }
                         ecdh = (EC_KEY *)parg;
                         if (!(s->internal->options & SSL_OP_SINGLE_ECDH_USE)) {
                                 if (!EC_KEY_generate_key(ecdh)) {
                                         EC_KEY_free(ecdh);
-                                        SSLerror(
-                                            ERR_R_ECDH_LIB);
+                                        SSLerror(ERR_R_ECDH_LIB);
                                         return (ret);
                                 }
                         }
@@ -2069,8 +2063,7 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                 break;
         case SSL_CTRL_SET_TMP_ECDH_CB:
                 {
-                        SSLerror(
-                            ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                        SSLerror(ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                         return (ret);
                 }
                 break;
@@ -2083,19 +2076,16 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                         if (parg == NULL)
                                 break;
                         if (strlen((char *)parg) > TLSEXT_MAXLEN_host_name) {
-                                SSLerror(
-                                    SSL_R_SSL3_EXT_INVALID_SERVERNAME);
+                                SSLerror(SSL_R_SSL3_EXT_INVALID_SERVERNAME);
                                 return 0;
                         }
                         if ((s->tlsext_hostname = strdup((char *)parg))
                             == NULL) {
-                                SSLerror(
-                                    ERR_R_INTERNAL_ERROR);
+                                SSLerror(ERR_R_INTERNAL_ERROR);
                                 return 0;
                         }
                 } else {
-                        SSLerror(
-                            SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE);
+                        SSLerror(SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE);
                         return 0;
                 }
                 break;
@@ -2177,8 +2167,7 @@ ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
 
         if (cmd == SSL_CTRL_SET_TMP_DH_CB) {
                 if (!ssl_cert_inst(&s->cert)) {
-                        SSLerror(
-                            ERR_R_MALLOC_FAILURE);
+                        SSLerror(ERR_R_MALLOC_FAILURE);
                         return (0);
                 }
         }
@@ -2223,8 +2212,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 
                         dh = (DH *)parg;
                         if ((new = DHparams_dup(dh)) == NULL) {
-                                SSLerror(
-                                    ERR_R_DH_LIB);
+                                SSLerror(ERR_R_DH_LIB);
                                 return 0;
                         }
                         DH_free(cert->dh_tmp);
@@ -2246,21 +2234,18 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                         EC_KEY *ecdh = NULL;
 
                         if (parg == NULL) {
-                                SSLerror(
-                                    ERR_R_ECDH_LIB);
+                                SSLerror(ERR_R_ECDH_LIB);
                                 return 0;
                         }
                         ecdh = EC_KEY_dup((EC_KEY *)parg);
                         if (ecdh == NULL) {
-                                SSLerror(
-                                    ERR_R_EC_LIB);
+                                SSLerror(ERR_R_EC_LIB);
                                 return 0;
                         }
                         if (!(ctx->internal->options & SSL_OP_SINGLE_ECDH_USE)) {
                                 if (!EC_KEY_generate_key(ecdh)) {
                                         EC_KEY_free(ecdh);
-                                        SSLerror(
-                                            ERR_R_ECDH_LIB);
+                                        SSLerror(ERR_R_ECDH_LIB);
                                         return 0;
                                 }
                         }
@@ -2272,8 +2257,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                 /* break; */
         case SSL_CTRL_SET_TMP_ECDH_CB:
                 {
-                        SSLerror(
-                            ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                        SSLerror(ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                         return (0);
                 }
                 break;
@@ -2287,8 +2271,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                         if (!keys)
                                 return 48;
                         if (larg != 48) {
-                                SSLerror(
-                                    SSL_R_INVALID_TICKET_KEYS_LENGTH);
+                                SSLerror(SSL_R_INVALID_TICKET_KEYS_LENGTH);
                                 return 0;
                         }
                         if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS) {