6 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c
index f334971fe6..1689bf44d2 100644
--- a/src/lib/libcrypto/engine/eng_cnf.c
+++ b/src/lib/libcrypto/engine/eng_cnf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_cnf.c,v 1.10 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_cnf.c,v 1.11 2014/06/22 11:33:47 jsing Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -195,8 +195,8 @@ err:
                 ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE,
                     ENGINE_R_ENGINE_CONFIGURATION_ERROR);
                 if (ecmd)
-                        ERR_asprintf_error_data
-                        ("section=%s, name=%s, value=%s",
+                        ERR_asprintf_error_data(
+                            "section=%s, name=%s, value=%s",
                             ecmd->section, ecmd->name, ecmd->value);
         }
         if (e)
diff --git a/src/lib/libcrypto/engine/eng_err.c b/src/lib/libcrypto/engine/eng_err.c
index 9b1e51e5ed..298c33f485 100644
--- a/src/lib/libcrypto/engine/eng_err.c
+++ b/src/lib/libcrypto/engine/eng_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_err.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_err.c,v 1.9 2014/06/22 11:33:47 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
  *
@@ -68,7 +68,7 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ENGINE,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ENGINE,0,reason)
 
-static ERR_STRING_DATA ENGINE_str_functs[]= {
+static ERR_STRING_DATA ENGINE_str_functs[] = {
         {ERR_FUNC(ENGINE_F_DYNAMIC_CTRL),       "DYNAMIC_CTRL"},
         {ERR_FUNC(ENGINE_F_DYNAMIC_GET_DATA_CTX),       "DYNAMIC_GET_DATA_CTX"},
         {ERR_FUNC(ENGINE_F_DYNAMIC_LOAD),       "DYNAMIC_LOAD"},
@@ -111,7 +111,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= {
         {0, NULL}
 };
 
-static ERR_STRING_DATA ENGINE_str_reasons[]= {
+static ERR_STRING_DATA ENGINE_str_reasons[] = {
         {ERR_REASON(ENGINE_R_ALREADY_LOADED)     , "already loaded"},
         {ERR_REASON(ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER), "argument is not a number"},
         {ERR_REASON(ENGINE_R_CMD_NOT_EXECUTABLE) , "cmd not executable"},
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index 112f797ba4..94190ca7f1 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_fat.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_fat.c,v 1.12 2014/06/22 11:33:47 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -125,8 +125,8 @@ int_def_cb(const char *alg, int len, void *arg)
         else if (!strncmp(alg, "DIGESTS", len))
                 *pflags |= ENGINE_METHOD_DIGESTS;
         else if (!strncmp(alg, "PKEY", len))
-                *pflags |=
-                    ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
+                *pflags |= ENGINE_METHOD_PKEY_METHS |
+                    ENGINE_METHOD_PKEY_ASN1_METHS;
         else if (!strncmp(alg, "PKEY_CRYPTO", len))
                 *pflags |= ENGINE_METHOD_PKEY_METHS;
         else if (!strncmp(alg, "PKEY_ASN1", len))
diff --git a/src/lib/libssl/src/crypto/engine/eng_cnf.c b/src/lib/libssl/src/crypto/engine/eng_cnf.c
index f334971fe6..1689bf44d2 100644
--- a/src/lib/libssl/src/crypto/engine/eng_cnf.c
+++ b/src/lib/libssl/src/crypto/engine/eng_cnf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_cnf.c,v 1.10 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_cnf.c,v 1.11 2014/06/22 11:33:47 jsing Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -195,8 +195,8 @@ err:
                 ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE,
                     ENGINE_R_ENGINE_CONFIGURATION_ERROR);
                 if (ecmd)
-                        ERR_asprintf_error_data
-                        ("section=%s, name=%s, value=%s",
+                        ERR_asprintf_error_data(
+                            "section=%s, name=%s, value=%s",
                             ecmd->section, ecmd->name, ecmd->value);
         }
         if (e)
diff --git a/src/lib/libssl/src/crypto/engine/eng_err.c b/src/lib/libssl/src/crypto/engine/eng_err.c
index 9b1e51e5ed..298c33f485 100644
--- a/src/lib/libssl/src/crypto/engine/eng_err.c
+++ b/src/lib/libssl/src/crypto/engine/eng_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_err.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_err.c,v 1.9 2014/06/22 11:33:47 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
  *
@@ -68,7 +68,7 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ENGINE,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ENGINE,0,reason)
 
-static ERR_STRING_DATA ENGINE_str_functs[]= {
+static ERR_STRING_DATA ENGINE_str_functs[] = {
         {ERR_FUNC(ENGINE_F_DYNAMIC_CTRL),       "DYNAMIC_CTRL"},
         {ERR_FUNC(ENGINE_F_DYNAMIC_GET_DATA_CTX),       "DYNAMIC_GET_DATA_CTX"},
         {ERR_FUNC(ENGINE_F_DYNAMIC_LOAD),       "DYNAMIC_LOAD"},
@@ -111,7 +111,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= {
         {0, NULL}
 };
 
-static ERR_STRING_DATA ENGINE_str_reasons[]= {
+static ERR_STRING_DATA ENGINE_str_reasons[] = {
         {ERR_REASON(ENGINE_R_ALREADY_LOADED)     , "already loaded"},
         {ERR_REASON(ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER), "argument is not a number"},
         {ERR_REASON(ENGINE_R_CMD_NOT_EXECUTABLE) , "cmd not executable"},
diff --git a/src/lib/libssl/src/crypto/engine/eng_fat.c b/src/lib/libssl/src/crypto/engine/eng_fat.c
index 112f797ba4..94190ca7f1 100644
--- a/src/lib/libssl/src/crypto/engine/eng_fat.c
+++ b/src/lib/libssl/src/crypto/engine/eng_fat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_fat.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_fat.c,v 1.12 2014/06/22 11:33:47 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -125,8 +125,8 @@ int_def_cb(const char *alg, int len, void *arg)
         else if (!strncmp(alg, "DIGESTS", len))
                 *pflags |= ENGINE_METHOD_DIGESTS;
         else if (!strncmp(alg, "PKEY", len))
-                *pflags |=
-                    ENGINE_METHOD_PKEY_METHS|ENGINE_METHOD_PKEY_ASN1_METHS;
+                *pflags |= ENGINE_METHOD_PKEY_METHS |
+                    ENGINE_METHOD_PKEY_ASN1_METHS;
         else if (!strncmp(alg, "PKEY_CRYPTO", len))
                 *pflags |= ENGINE_METHOD_PKEY_METHS;
         else if (!strncmp(alg, "PKEY_ASN1", len))