Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 57 insertions, 61 deletions

diff --git a/openssl/engines/e_atalla_err.c b/openssl/engines/e_atalla_err.c
index fd3e0049c..ff4732238 100644
--- a/openssl/engines/e_atalla_err.c
+++ b/openssl/engines/e_atalla_err.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -53,7 +53,8 @@
  *
  */
 
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+/*
+ * NOTE: this file was auto generated by the mkerr.pl script: any changes
  * made to it will be overwritten when the script next updates this file,
  * only reason strings will be preserved.
  */
@@ -65,85 +66,80 @@
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 
-#define ERR_FUNC(func) ERR_PACK(0,func,0)
-#define ERR_REASON(reason) ERR_PACK(0,0,reason)
-
-static ERR_STRING_DATA ATALLA_str_functs[]=
-	{
-{ERR_FUNC(ATALLA_F_ATALLA_CTRL),	"ATALLA_CTRL"},
-{ERR_FUNC(ATALLA_F_ATALLA_FINISH),	"ATALLA_FINISH"},
-{ERR_FUNC(ATALLA_F_ATALLA_INIT),	"ATALLA_INIT"},
-{ERR_FUNC(ATALLA_F_ATALLA_MOD_EXP),	"ATALLA_MOD_EXP"},
-{ERR_FUNC(ATALLA_F_ATALLA_RSA_MOD_EXP),	"ATALLA_RSA_MOD_EXP"},
-{0,NULL}
-	};
-
-static ERR_STRING_DATA ATALLA_str_reasons[]=
-	{
-{ERR_REASON(ATALLA_R_ALREADY_LOADED)     ,"already loaded"},
-{ERR_REASON(ATALLA_R_BN_CTX_FULL)        ,"bn ctx full"},
-{ERR_REASON(ATALLA_R_BN_EXPAND_FAIL)     ,"bn expand fail"},
-{ERR_REASON(ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
-{ERR_REASON(ATALLA_R_MISSING_KEY_COMPONENTS),"missing key components"},
-{ERR_REASON(ATALLA_R_NOT_LOADED)         ,"not loaded"},
-{ERR_REASON(ATALLA_R_REQUEST_FAILED)     ,"request failed"},
-{ERR_REASON(ATALLA_R_UNIT_FAILURE)       ,"unit failure"},
-{0,NULL}
-	};
+# define ERR_FUNC(func) ERR_PACK(0,func,0)
+# define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
+static ERR_STRING_DATA ATALLA_str_functs[] = {
+    {ERR_FUNC(ATALLA_F_ATALLA_CTRL), "ATALLA_CTRL"},
+    {ERR_FUNC(ATALLA_F_ATALLA_FINISH), "ATALLA_FINISH"},
+    {ERR_FUNC(ATALLA_F_ATALLA_INIT), "ATALLA_INIT"},
+    {ERR_FUNC(ATALLA_F_ATALLA_MOD_EXP), "ATALLA_MOD_EXP"},
+    {ERR_FUNC(ATALLA_F_ATALLA_RSA_MOD_EXP), "ATALLA_RSA_MOD_EXP"},
+    {0, NULL}
+};
+
+static ERR_STRING_DATA ATALLA_str_reasons[] = {
+    {ERR_REASON(ATALLA_R_ALREADY_LOADED), "already loaded"},
+    {ERR_REASON(ATALLA_R_BN_CTX_FULL), "bn ctx full"},
+    {ERR_REASON(ATALLA_R_BN_EXPAND_FAIL), "bn expand fail"},
+    {ERR_REASON(ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED),
+     "ctrl command not implemented"},
+    {ERR_REASON(ATALLA_R_MISSING_KEY_COMPONENTS), "missing key components"},
+    {ERR_REASON(ATALLA_R_NOT_LOADED), "not loaded"},
+    {ERR_REASON(ATALLA_R_REQUEST_FAILED), "request failed"},
+    {ERR_REASON(ATALLA_R_UNIT_FAILURE), "unit failure"},
+    {0, NULL}
+};
 
 #endif
 
 #ifdef ATALLA_LIB_NAME
-static ERR_STRING_DATA ATALLA_lib_name[]=
-        {
-{0	,ATALLA_LIB_NAME},
-{0,NULL}
-	};
+static ERR_STRING_DATA ATALLA_lib_name[] = {
+    {0, ATALLA_LIB_NAME},
+    {0, NULL}
+};
 #endif
 
-
-static int ATALLA_lib_error_code=0;
-static int ATALLA_error_init=1;
+static int ATALLA_lib_error_code = 0;
+static int ATALLA_error_init = 1;
 
 static void ERR_load_ATALLA_strings(void)
-	{
-	if (ATALLA_lib_error_code == 0)
-		ATALLA_lib_error_code=ERR_get_next_error_library();
+{
+    if (ATALLA_lib_error_code == 0)
+        ATALLA_lib_error_code = ERR_get_next_error_library();
 
-	if (ATALLA_error_init)
-		{
-		ATALLA_error_init=0;
+    if (ATALLA_error_init) {
+        ATALLA_error_init = 0;
 #ifndef OPENSSL_NO_ERR
-		ERR_load_strings(ATALLA_lib_error_code,ATALLA_str_functs);
-		ERR_load_strings(ATALLA_lib_error_code,ATALLA_str_reasons);
+        ERR_load_strings(ATALLA_lib_error_code, ATALLA_str_functs);
+        ERR_load_strings(ATALLA_lib_error_code, ATALLA_str_reasons);
 #endif
 
 #ifdef ATALLA_LIB_NAME
-		ATALLA_lib_name->error = ERR_PACK(ATALLA_lib_error_code,0,0);
-		ERR_load_strings(0,ATALLA_lib_name);
+        ATALLA_lib_name->error = ERR_PACK(ATALLA_lib_error_code, 0, 0);
+        ERR_load_strings(0, ATALLA_lib_name);
 #endif
-		}
-	}
+    }
+}
 
 static void ERR_unload_ATALLA_strings(void)
-	{
-	if (ATALLA_error_init == 0)
-		{
+{
+    if (ATALLA_error_init == 0) {
 #ifndef OPENSSL_NO_ERR
-		ERR_unload_strings(ATALLA_lib_error_code,ATALLA_str_functs);
-		ERR_unload_strings(ATALLA_lib_error_code,ATALLA_str_reasons);
+        ERR_unload_strings(ATALLA_lib_error_code, ATALLA_str_functs);
+        ERR_unload_strings(ATALLA_lib_error_code, ATALLA_str_reasons);
 #endif
 
 #ifdef ATALLA_LIB_NAME
-		ERR_unload_strings(0,ATALLA_lib_name);
+        ERR_unload_strings(0, ATALLA_lib_name);
 #endif
-		ATALLA_error_init=1;
-		}
-	}
+        ATALLA_error_init = 1;
+    }
+}
 
 static void ERR_ATALLA_error(int function, int reason, char *file, int line)
-	{
-	if (ATALLA_lib_error_code == 0)
-		ATALLA_lib_error_code=ERR_get_next_error_library();
-	ERR_PUT_error(ATALLA_lib_error_code,function,reason,file,line);
-	}
+{
+    if (ATALLA_lib_error_code == 0)
+        ATALLA_lib_error_code = ERR_get_next_error_library();
+    ERR_PUT_error(ATALLA_lib_error_code, function, reason, file, line);
+}