1 files changed, 28 insertions, 36 deletions

diff --git a/src/lib/libcrypto/aes/aes.h b/src/lib/libcrypto/aes/aes.h
index 031abf01b5..4d477bdf19 100644
--- a/src/lib/libcrypto/aes/aes.h
+++ b/src/lib/libcrypto/aes/aes.h
@@ -75,69 +75,61 @@ extern "C" {
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
 #ifdef AES_LONG
-    unsigned long rd_key[4 *(AES_MAXNR + 1)];
+        unsigned long rd_key[4 *(AES_MAXNR + 1)];
 #else
-    unsigned int rd_key[4 *(AES_MAXNR + 1)];
+        unsigned int rd_key[4 *(AES_MAXNR + 1)];
 #endif
-    int rounds;
+        int rounds;
 };
 typedef struct aes_key_st AES_KEY;
 
 const char *AES_options(void);
 
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-        AES_KEY *key);
+    AES_KEY *key);
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-        AES_KEY *key);
+    AES_KEY *key);
 
 int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-        AES_KEY *key);
+    AES_KEY *key);
 int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-        AES_KEY *key);
+    AES_KEY *key);
 
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-        const AES_KEY *key);
+    const AES_KEY *key);
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-        const AES_KEY *key);
+    const AES_KEY *key);
 
 void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-        const AES_KEY *key, const int enc);
+    const AES_KEY *key, const int enc);
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char *ivec, int *num);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num);
 void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-        size_t length, const AES_KEY *key,
-        unsigned char ivec[AES_BLOCK_SIZE],
-        unsigned char ecount_buf[AES_BLOCK_SIZE],
-        unsigned int *num);
+    size_t length, const AES_KEY *key, unsigned char ivec[AES_BLOCK_SIZE],
+    unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num);
 /* NB: the IV is _two_ blocks long */
 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 /* NB: the IV is _four_ blocks long */
 void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        const AES_KEY *key2, const unsigned char *ivec,
-                        const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-                unsigned char *out,
-                const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-                unsigned char *out,
-                const unsigned char *in, unsigned int inlen);
+    size_t length, const AES_KEY *key, const AES_KEY *key2,
+    const unsigned char *ivec, const int enc);
+
+int AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
+int AES_unwrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
 
 
 #ifdef  __cplusplus