diff options
author | jsing <> | 2014-04-15 14:38:10 +0000 |
---|---|---|
committer | jsing <> | 2014-04-15 14:38:10 +0000 |
commit | fd934c882a62cc862a41725de129e7a623ce16a3 (patch) | |
tree | 0afadc32450a98b257d0902261d2c1f7ba6b56be /src/lib/libcrypto/aes/aes_misc.c | |
parent | 69a8d2dcc19aed0d1116ba2ecd81cce5ae736c94 (diff) | |
download | openbsd-fd934c882a62cc862a41725de129e7a623ce16a3.tar.gz openbsd-fd934c882a62cc862a41725de129e7a623ce16a3.tar.bz2 openbsd-fd934c882a62cc862a41725de129e7a623ce16a3.zip |
First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using
tr and md5.
Diffstat (limited to 'src/lib/libcrypto/aes/aes_misc.c')
-rw-r--r-- | src/lib/libcrypto/aes/aes_misc.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c index f083488ecb..d666c06409 100644 --- a/src/lib/libcrypto/aes/aes_misc.c +++ b/src/lib/libcrypto/aes/aes_misc.c | |||
@@ -56,30 +56,33 @@ | |||
56 | 56 | ||
57 | const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; | 57 | const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; |
58 | 58 | ||
59 | const char *AES_options(void) { | 59 | const char |
60 | *AES_options(void) { | ||
60 | #ifdef FULL_UNROLL | 61 | #ifdef FULL_UNROLL |
61 | return "aes(full)"; | 62 | return "aes(full)"; |
62 | #else | 63 | #else |
63 | return "aes(partial)"; | 64 | return "aes(partial)"; |
64 | #endif | 65 | #endif |
65 | } | 66 | } |
66 | 67 | ||
67 | /* FIPS wrapper functions to block low level AES calls in FIPS mode */ | 68 | /* FIPS wrapper functions to block low level AES calls in FIPS mode */ |
68 | 69 | ||
69 | int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | 70 | int |
70 | AES_KEY *key) | 71 | AES_set_encrypt_key(const unsigned char *userKey, const int bits, |
71 | { | 72 | AES_KEY *key) |
73 | { | ||
72 | #ifdef OPENSSL_FIPS | 74 | #ifdef OPENSSL_FIPS |
73 | fips_cipher_abort(AES); | 75 | fips_cipher_abort(AES); |
74 | #endif | 76 | #endif |
75 | return private_AES_set_encrypt_key(userKey, bits, key); | 77 | return private_AES_set_encrypt_key(userKey, bits, key); |
76 | } | 78 | } |
77 | 79 | ||
78 | int AES_set_decrypt_key(const unsigned char *userKey, const int bits, | 80 | int |
79 | AES_KEY *key) | 81 | AES_set_decrypt_key(const unsigned char *userKey, const int bits, |
80 | { | 82 | AES_KEY *key) |
83 | { | ||
81 | #ifdef OPENSSL_FIPS | 84 | #ifdef OPENSSL_FIPS |
82 | fips_cipher_abort(AES); | 85 | fips_cipher_abort(AES); |
83 | #endif | 86 | #endif |
84 | return private_AES_set_decrypt_key(userKey, bits, key); | 87 | return private_AES_set_decrypt_key(userKey, bits, key); |
85 | } | 88 | } |