summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2005-04-29 05:37:11 +0000
committerDamien Miller <djm@cvs.openbsd.org>2005-04-29 05:37:11 +0000
commite383e900378a88d24dbbcef18cd203adc00de20b (patch)
treea9e53bd803cf66ee7a3ea58fe359d4f66583c145 /lib/libssl
parent71205964465210b6aa8681bfb76ebbcd25db6439 (diff)
import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/src/crypto/evp/e_old.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/libssl/src/crypto/evp/e_old.c b/lib/libssl/src/crypto/evp/e_old.c
index 1642af4869d..92dc4989451 100644
--- a/lib/libssl/src/crypto/evp/e_old.c
+++ b/lib/libssl/src/crypto/evp/e_old.c
@@ -56,10 +56,6 @@
*
*/
-#ifdef OPENSSL_NO_DEPRECATED
-static void *dummy = &dummy;
-#else
-
#include <openssl/evp.h>
/* Define some deprecated functions, so older programs
@@ -70,56 +66,43 @@ static void *dummy = &dummy;
#ifndef OPENSSL_NO_BF
#undef EVP_bf_cfb
-const EVP_CIPHER *EVP_bf_cfb(void);
const EVP_CIPHER *EVP_bf_cfb(void) { return EVP_bf_cfb64(); }
#endif
#ifndef OPENSSL_NO_DES
#undef EVP_des_cfb
-const EVP_CIPHER *EVP_des_cfb(void);
const EVP_CIPHER *EVP_des_cfb(void) { return EVP_des_cfb64(); }
#undef EVP_des_ede3_cfb
-const EVP_CIPHER *EVP_des_ede3_cfb(void);
const EVP_CIPHER *EVP_des_ede3_cfb(void) { return EVP_des_ede3_cfb64(); }
#undef EVP_des_ede_cfb
-const EVP_CIPHER *EVP_des_ede_cfb(void);
const EVP_CIPHER *EVP_des_ede_cfb(void) { return EVP_des_ede_cfb64(); }
#endif
#ifndef OPENSSL_NO_IDEA
#undef EVP_idea_cfb
-const EVP_CIPHER *EVP_idea_cfb(void);
const EVP_CIPHER *EVP_idea_cfb(void) { return EVP_idea_cfb64(); }
#endif
#ifndef OPENSSL_NO_RC2
#undef EVP_rc2_cfb
-const EVP_CIPHER *EVP_rc2_cfb(void);
const EVP_CIPHER *EVP_rc2_cfb(void) { return EVP_rc2_cfb64(); }
#endif
#ifndef OPENSSL_NO_CAST
#undef EVP_cast5_cfb
-const EVP_CIPHER *EVP_cast5_cfb(void);
const EVP_CIPHER *EVP_cast5_cfb(void) { return EVP_cast5_cfb64(); }
#endif
#ifndef OPENSSL_NO_RC5
#undef EVP_rc5_32_12_16_cfb
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void) { return EVP_rc5_32_12_16_cfb64(); }
#endif
#ifndef OPENSSL_NO_AES
#undef EVP_aes_128_cfb
-const EVP_CIPHER *EVP_aes_128_cfb(void);
const EVP_CIPHER *EVP_aes_128_cfb(void) { return EVP_aes_128_cfb128(); }
#undef EVP_aes_192_cfb
-const EVP_CIPHER *EVP_aes_192_cfb(void);
const EVP_CIPHER *EVP_aes_192_cfb(void) { return EVP_aes_192_cfb128(); }
#undef EVP_aes_256_cfb
-const EVP_CIPHER *EVP_aes_256_cfb(void);
const EVP_CIPHER *EVP_aes_256_cfb(void) { return EVP_aes_256_cfb128(); }
#endif
-
-#endif