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

1 files changed, 17 insertions, 16 deletions

diff --git a/openssl/crypto/aes/aes_misc.c b/openssl/crypto/aes/aes_misc.c
index f083488ec..ab948ad85 100644
--- a/openssl/crypto/aes/aes_misc.c
+++ b/openssl/crypto/aes/aes_misc.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
@@ -54,32 +54,33 @@
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
-const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;
+const char AES_version[] = "AES" OPENSSL_VERSION_PTEXT;
 
-const char *AES_options(void) {
+const char *AES_options(void)
+{
 #ifdef FULL_UNROLL
-        return "aes(full)";
-#else   
-        return "aes(partial)";
+    return "aes(full)";
+#else
+    return "aes(partial)";
 #endif
 }
 
 /* FIPS wrapper functions to block low level AES calls in FIPS mode */
 
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key)
-	{
+                        AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
-	fips_cipher_abort(AES);
+    fips_cipher_abort(AES);
 #endif
-	return private_AES_set_encrypt_key(userKey, bits, key);
-	}
+    return private_AES_set_encrypt_key(userKey, bits, key);
+}
 
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-			AES_KEY *key)
-	{
+                        AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
-	fips_cipher_abort(AES);
+    fips_cipher_abort(AES);
 #endif
-	return private_AES_set_decrypt_key(userKey, bits, key);
-	}
+    return private_AES_set_decrypt_key(userKey, bits, key);
+}