diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-10 11:45:10 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-02-10 11:45:10 +0000 |
| commit | dff585e17ff45cc1b698ba9f6e359fe98a4cc087 (patch) | |
| tree | a4db953a2be8f7824c6f79c13d41f434a1bfe4d7 | |
| parent | 341310e18a53ee13d37081fac4ef3b74c52ce51f (diff) | |
unifdef OPENSSL_NO_RC5
| -rw-r--r-- | lib/libssl/src/crypto/evp/c_all.c | 11 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/evp/e_old.c | 12 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/evp/evp.h | 9 |
3 files changed, 3 insertions, 29 deletions
diff --git a/lib/libssl/src/crypto/evp/c_all.c b/lib/libssl/src/crypto/evp/c_all.c index a8593c16b28..d794629ca87 100644 --- a/lib/libssl/src/crypto/evp/c_all.c +++ b/lib/libssl/src/crypto/evp/c_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_all.c,v 1.15 2015/02/07 03:23:05 jsing Exp $ */ +/* $OpenBSD: c_all.c,v 1.16 2015/02/10 11:45:09 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -148,15 +148,6 @@ OpenSSL_add_all_ciphers(void) EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc"); #endif -#ifndef OPENSSL_NO_RC5 - EVP_add_cipher(EVP_rc5_32_12_16_ecb()); - EVP_add_cipher(EVP_rc5_32_12_16_cfb()); - EVP_add_cipher(EVP_rc5_32_12_16_ofb()); - EVP_add_cipher(EVP_rc5_32_12_16_cbc()); - EVP_add_cipher_alias(SN_rc5_cbc, "rc5"); - EVP_add_cipher_alias(SN_rc5_cbc, "RC5"); -#endif - #ifndef OPENSSL_NO_AES EVP_add_cipher(EVP_aes_128_ecb()); EVP_add_cipher(EVP_aes_128_cbc()); diff --git a/lib/libssl/src/crypto/evp/e_old.c b/lib/libssl/src/crypto/evp/e_old.c index 235ebe242b4..71166654b01 100644 --- a/lib/libssl/src/crypto/evp/e_old.c +++ b/lib/libssl/src/crypto/evp/e_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_old.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ +/* $OpenBSD: e_old.c,v 1.8 2015/02/10 11:45:09 jsing Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2004. */ @@ -132,16 +132,6 @@ EVP_cast5_cfb(void) } #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); diff --git a/lib/libssl/src/crypto/evp/evp.h b/lib/libssl/src/crypto/evp/evp.h index 6de762a4ffd..330e01e0e6d 100644 --- a/lib/libssl/src/crypto/evp/evp.h +++ b/lib/libssl/src/crypto/evp/evp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evp.h,v 1.43 2015/02/10 09:52:35 miod Exp $ */ +/* $OpenBSD: evp.h,v 1.44 2015/02/10 11:45:09 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -746,13 +746,6 @@ const EVP_CIPHER *EVP_cast5_cfb64(void); # define EVP_cast5_cfb EVP_cast5_cfb64 const EVP_CIPHER *EVP_cast5_ofb(void); #endif -#ifndef OPENSSL_NO_RC5 -const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void); -const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void); -const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void); -# define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64 -const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void); -#endif #ifndef OPENSSL_NO_AES const EVP_CIPHER *EVP_aes_128_ecb(void); const EVP_CIPHER *EVP_aes_128_cbc(void); |