diff options
author | jsing <> | 2014-05-08 15:13:06 +0000 |
---|---|---|
committer | jsing <> | 2014-05-08 15:13:06 +0000 |
commit | 9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb (patch) | |
tree | ef972fdbbb4716d3000038e30dffd3367e980018 /src/lib/libcrypto/evp/e_old.c | |
parent | ff8febcf7ff5708902485e389dc8f34d77f0a932 (diff) | |
download | openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.tar.gz openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.tar.bz2 openbsd-9aba59b541a8afc2b2b59be08a25cf58fa9fdeeb.zip |
KNF.
Diffstat (limited to 'src/lib/libcrypto/evp/e_old.c')
-rw-r--r-- | src/lib/libcrypto/evp/e_old.c | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/src/lib/libcrypto/evp/e_old.c b/src/lib/libcrypto/evp/e_old.c index 1642af4869..c27b61a4bf 100644 --- a/src/lib/libcrypto/evp/e_old.c +++ b/src/lib/libcrypto/evp/e_old.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * are met: | 10 | * are met: |
11 | * | 11 | * |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * | 14 | * |
15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
@@ -71,55 +71,88 @@ static void *dummy = &dummy; | |||
71 | #ifndef OPENSSL_NO_BF | 71 | #ifndef OPENSSL_NO_BF |
72 | #undef EVP_bf_cfb | 72 | #undef EVP_bf_cfb |
73 | const EVP_CIPHER *EVP_bf_cfb(void); | 73 | const EVP_CIPHER *EVP_bf_cfb(void); |
74 | const EVP_CIPHER *EVP_bf_cfb(void) { return EVP_bf_cfb64(); } | 74 | const EVP_CIPHER *EVP_bf_cfb(void) |
75 | { | ||
76 | return EVP_bf_cfb64(); | ||
77 | } | ||
75 | #endif | 78 | #endif |
76 | 79 | ||
77 | #ifndef OPENSSL_NO_DES | 80 | #ifndef OPENSSL_NO_DES |
78 | #undef EVP_des_cfb | 81 | #undef EVP_des_cfb |
79 | const EVP_CIPHER *EVP_des_cfb(void); | 82 | const EVP_CIPHER *EVP_des_cfb(void); |
80 | const EVP_CIPHER *EVP_des_cfb(void) { return EVP_des_cfb64(); } | 83 | const EVP_CIPHER *EVP_des_cfb(void) |
84 | { | ||
85 | return EVP_des_cfb64(); | ||
86 | } | ||
81 | #undef EVP_des_ede3_cfb | 87 | #undef EVP_des_ede3_cfb |
82 | const EVP_CIPHER *EVP_des_ede3_cfb(void); | 88 | const EVP_CIPHER *EVP_des_ede3_cfb(void); |
83 | const EVP_CIPHER *EVP_des_ede3_cfb(void) { return EVP_des_ede3_cfb64(); } | 89 | const EVP_CIPHER *EVP_des_ede3_cfb(void) |
90 | { | ||
91 | return EVP_des_ede3_cfb64(); | ||
92 | } | ||
84 | #undef EVP_des_ede_cfb | 93 | #undef EVP_des_ede_cfb |
85 | const EVP_CIPHER *EVP_des_ede_cfb(void); | 94 | const EVP_CIPHER *EVP_des_ede_cfb(void); |
86 | const EVP_CIPHER *EVP_des_ede_cfb(void) { return EVP_des_ede_cfb64(); } | 95 | const EVP_CIPHER *EVP_des_ede_cfb(void) |
96 | { | ||
97 | return EVP_des_ede_cfb64(); | ||
98 | } | ||
87 | #endif | 99 | #endif |
88 | 100 | ||
89 | #ifndef OPENSSL_NO_IDEA | 101 | #ifndef OPENSSL_NO_IDEA |
90 | #undef EVP_idea_cfb | 102 | #undef EVP_idea_cfb |
91 | const EVP_CIPHER *EVP_idea_cfb(void); | 103 | const EVP_CIPHER *EVP_idea_cfb(void); |
92 | const EVP_CIPHER *EVP_idea_cfb(void) { return EVP_idea_cfb64(); } | 104 | const EVP_CIPHER *EVP_idea_cfb(void) |
105 | { | ||
106 | return EVP_idea_cfb64(); | ||
107 | } | ||
93 | #endif | 108 | #endif |
94 | 109 | ||
95 | #ifndef OPENSSL_NO_RC2 | 110 | #ifndef OPENSSL_NO_RC2 |
96 | #undef EVP_rc2_cfb | 111 | #undef EVP_rc2_cfb |
97 | const EVP_CIPHER *EVP_rc2_cfb(void); | 112 | const EVP_CIPHER *EVP_rc2_cfb(void); |
98 | const EVP_CIPHER *EVP_rc2_cfb(void) { return EVP_rc2_cfb64(); } | 113 | const EVP_CIPHER *EVP_rc2_cfb(void) |
114 | { | ||
115 | return EVP_rc2_cfb64(); | ||
116 | } | ||
99 | #endif | 117 | #endif |
100 | 118 | ||
101 | #ifndef OPENSSL_NO_CAST | 119 | #ifndef OPENSSL_NO_CAST |
102 | #undef EVP_cast5_cfb | 120 | #undef EVP_cast5_cfb |
103 | const EVP_CIPHER *EVP_cast5_cfb(void); | 121 | const EVP_CIPHER *EVP_cast5_cfb(void); |
104 | const EVP_CIPHER *EVP_cast5_cfb(void) { return EVP_cast5_cfb64(); } | 122 | const EVP_CIPHER *EVP_cast5_cfb(void) |
123 | { | ||
124 | return EVP_cast5_cfb64(); | ||
125 | } | ||
105 | #endif | 126 | #endif |
106 | 127 | ||
107 | #ifndef OPENSSL_NO_RC5 | 128 | #ifndef OPENSSL_NO_RC5 |
108 | #undef EVP_rc5_32_12_16_cfb | 129 | #undef EVP_rc5_32_12_16_cfb |
109 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); | 130 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); |
110 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) { return EVP_rc5_32_12_16_cfb64(); } | 131 | const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) |
132 | { | ||
133 | return EVP_rc5_32_12_16_cfb64(); | ||
134 | } | ||
111 | #endif | 135 | #endif |
112 | 136 | ||
113 | #ifndef OPENSSL_NO_AES | 137 | #ifndef OPENSSL_NO_AES |
114 | #undef EVP_aes_128_cfb | 138 | #undef EVP_aes_128_cfb |
115 | const EVP_CIPHER *EVP_aes_128_cfb(void); | 139 | const EVP_CIPHER *EVP_aes_128_cfb(void); |
116 | const EVP_CIPHER *EVP_aes_128_cfb(void) { return EVP_aes_128_cfb128(); } | 140 | const EVP_CIPHER *EVP_aes_128_cfb(void) |
141 | { | ||
142 | return EVP_aes_128_cfb128(); | ||
143 | } | ||
117 | #undef EVP_aes_192_cfb | 144 | #undef EVP_aes_192_cfb |
118 | const EVP_CIPHER *EVP_aes_192_cfb(void); | 145 | const EVP_CIPHER *EVP_aes_192_cfb(void); |
119 | const EVP_CIPHER *EVP_aes_192_cfb(void) { return EVP_aes_192_cfb128(); } | 146 | const EVP_CIPHER *EVP_aes_192_cfb(void) |
147 | { | ||
148 | return EVP_aes_192_cfb128(); | ||
149 | } | ||
120 | #undef EVP_aes_256_cfb | 150 | #undef EVP_aes_256_cfb |
121 | const EVP_CIPHER *EVP_aes_256_cfb(void); | 151 | const EVP_CIPHER *EVP_aes_256_cfb(void); |
122 | const EVP_CIPHER *EVP_aes_256_cfb(void) { return EVP_aes_256_cfb128(); } | 152 | const EVP_CIPHER *EVP_aes_256_cfb(void) |
153 | { | ||
154 | return EVP_aes_256_cfb128(); | ||
155 | } | ||
123 | #endif | 156 | #endif |
124 | 157 | ||
125 | #endif | 158 | #endif |