summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/c_all.c
diff options
context:
space:
mode:
authorjsing <>2015-02-10 11:45:09 +0000
committerjsing <>2015-02-10 11:45:09 +0000
commit3916ce5883a699ea542f26d548cde6c671e92add (patch)
tree36d8c426d50db13fd103cda705b80dbabb301181 /src/lib/libcrypto/evp/c_all.c
parent377dc8bee6f957bdd62fbe118154a641c70a0f05 (diff)
downloadopenbsd-3916ce5883a699ea542f26d548cde6c671e92add.tar.gz
openbsd-3916ce5883a699ea542f26d548cde6c671e92add.tar.bz2
openbsd-3916ce5883a699ea542f26d548cde6c671e92add.zip
unifdef OPENSSL_NO_RC5
Diffstat (limited to 'src/lib/libcrypto/evp/c_all.c')
-rw-r--r--src/lib/libcrypto/evp/c_all.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
index a8593c16b2..d794629ca8 100644
--- a/src/lib/libcrypto/evp/c_all.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_all.c,v 1.15 2015/02/07 03:23:05 jsing Exp $ */ 1/* $OpenBSD: c_all.c,v 1.16 2015/02/10 11:45:09 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -148,15 +148,6 @@ OpenSSL_add_all_ciphers(void)
148 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc"); 148 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
149#endif 149#endif
150 150
151#ifndef OPENSSL_NO_RC5
152 EVP_add_cipher(EVP_rc5_32_12_16_ecb());
153 EVP_add_cipher(EVP_rc5_32_12_16_cfb());
154 EVP_add_cipher(EVP_rc5_32_12_16_ofb());
155 EVP_add_cipher(EVP_rc5_32_12_16_cbc());
156 EVP_add_cipher_alias(SN_rc5_cbc, "rc5");
157 EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
158#endif
159
160#ifndef OPENSSL_NO_AES 151#ifndef OPENSSL_NO_AES
161 EVP_add_cipher(EVP_aes_128_ecb()); 152 EVP_add_cipher(EVP_aes_128_ecb());
162 EVP_add_cipher(EVP_aes_128_cbc()); 153 EVP_add_cipher(EVP_aes_128_cbc());