diff options
author | tedu <> | 2014-05-17 15:48:14 +0000 |
---|---|---|
committer | tedu <> | 2014-05-17 15:48:14 +0000 |
commit | 1b6e6882093f526dfd8e0c850b5e3516a4110514 (patch) | |
tree | fc123460249cc6c984dd81751ffb7d48df3dbd27 | |
parent | f9e51a39925ce6e0ee20ac56375dba268cf7c8bd (diff) | |
download | openbsd-1b6e6882093f526dfd8e0c850b5e3516a4110514.tar.gz openbsd-1b6e6882093f526dfd8e0c850b5e3516a4110514.tar.bz2 openbsd-1b6e6882093f526dfd8e0c850b5e3516a4110514.zip |
no no seed
-rw-r--r-- | src/lib/libcrypto/evp/c_allc.c | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 8 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/c_allc.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/evp.h | 8 |
4 files changed, 0 insertions, 34 deletions
diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c index 91ad980182..1c351d9b61 100644 --- a/src/lib/libcrypto/evp/c_allc.c +++ b/src/lib/libcrypto/evp/c_allc.c | |||
@@ -113,15 +113,6 @@ OpenSSL_add_all_ciphers(void) | |||
113 | EVP_add_cipher_alias(SN_idea_cbc, "idea"); | 113 | EVP_add_cipher_alias(SN_idea_cbc, "idea"); |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #ifndef OPENSSL_NO_SEED | ||
117 | EVP_add_cipher(EVP_seed_ecb()); | ||
118 | EVP_add_cipher(EVP_seed_cfb()); | ||
119 | EVP_add_cipher(EVP_seed_ofb()); | ||
120 | EVP_add_cipher(EVP_seed_cbc()); | ||
121 | EVP_add_cipher_alias(SN_seed_cbc, "SEED"); | ||
122 | EVP_add_cipher_alias(SN_seed_cbc, "seed"); | ||
123 | #endif | ||
124 | |||
125 | #ifndef OPENSSL_NO_RC2 | 116 | #ifndef OPENSSL_NO_RC2 |
126 | EVP_add_cipher(EVP_rc2_ecb()); | 117 | EVP_add_cipher(EVP_rc2_ecb()); |
127 | EVP_add_cipher(EVP_rc2_cfb()); | 118 | EVP_add_cipher(EVP_rc2_cfb()); |
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 3219a63d03..25a495b32f 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -814,14 +814,6 @@ const EVP_CIPHER *EVP_camellia_256_cfb128(void); | |||
814 | const EVP_CIPHER *EVP_camellia_256_ofb(void); | 814 | const EVP_CIPHER *EVP_camellia_256_ofb(void); |
815 | #endif | 815 | #endif |
816 | 816 | ||
817 | #ifndef OPENSSL_NO_SEED | ||
818 | const EVP_CIPHER *EVP_seed_ecb(void); | ||
819 | const EVP_CIPHER *EVP_seed_cbc(void); | ||
820 | const EVP_CIPHER *EVP_seed_cfb128(void); | ||
821 | # define EVP_seed_cfb EVP_seed_cfb128 | ||
822 | const EVP_CIPHER *EVP_seed_ofb(void); | ||
823 | #endif | ||
824 | |||
825 | #ifndef OPENSSL_NO_CHACHA | 817 | #ifndef OPENSSL_NO_CHACHA |
826 | const EVP_CIPHER *EVP_chacha20(void); | 818 | const EVP_CIPHER *EVP_chacha20(void); |
827 | #endif | 819 | #endif |
diff --git a/src/lib/libssl/src/crypto/evp/c_allc.c b/src/lib/libssl/src/crypto/evp/c_allc.c index 91ad980182..1c351d9b61 100644 --- a/src/lib/libssl/src/crypto/evp/c_allc.c +++ b/src/lib/libssl/src/crypto/evp/c_allc.c | |||
@@ -113,15 +113,6 @@ OpenSSL_add_all_ciphers(void) | |||
113 | EVP_add_cipher_alias(SN_idea_cbc, "idea"); | 113 | EVP_add_cipher_alias(SN_idea_cbc, "idea"); |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #ifndef OPENSSL_NO_SEED | ||
117 | EVP_add_cipher(EVP_seed_ecb()); | ||
118 | EVP_add_cipher(EVP_seed_cfb()); | ||
119 | EVP_add_cipher(EVP_seed_ofb()); | ||
120 | EVP_add_cipher(EVP_seed_cbc()); | ||
121 | EVP_add_cipher_alias(SN_seed_cbc, "SEED"); | ||
122 | EVP_add_cipher_alias(SN_seed_cbc, "seed"); | ||
123 | #endif | ||
124 | |||
125 | #ifndef OPENSSL_NO_RC2 | 116 | #ifndef OPENSSL_NO_RC2 |
126 | EVP_add_cipher(EVP_rc2_ecb()); | 117 | EVP_add_cipher(EVP_rc2_ecb()); |
127 | EVP_add_cipher(EVP_rc2_cfb()); | 118 | EVP_add_cipher(EVP_rc2_cfb()); |
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h index 3219a63d03..25a495b32f 100644 --- a/src/lib/libssl/src/crypto/evp/evp.h +++ b/src/lib/libssl/src/crypto/evp/evp.h | |||
@@ -814,14 +814,6 @@ const EVP_CIPHER *EVP_camellia_256_cfb128(void); | |||
814 | const EVP_CIPHER *EVP_camellia_256_ofb(void); | 814 | const EVP_CIPHER *EVP_camellia_256_ofb(void); |
815 | #endif | 815 | #endif |
816 | 816 | ||
817 | #ifndef OPENSSL_NO_SEED | ||
818 | const EVP_CIPHER *EVP_seed_ecb(void); | ||
819 | const EVP_CIPHER *EVP_seed_cbc(void); | ||
820 | const EVP_CIPHER *EVP_seed_cfb128(void); | ||
821 | # define EVP_seed_cfb EVP_seed_cfb128 | ||
822 | const EVP_CIPHER *EVP_seed_ofb(void); | ||
823 | #endif | ||
824 | |||
825 | #ifndef OPENSSL_NO_CHACHA | 817 | #ifndef OPENSSL_NO_CHACHA |
826 | const EVP_CIPHER *EVP_chacha20(void); | 818 | const EVP_CIPHER *EVP_chacha20(void); |
827 | #endif | 819 | #endif |