summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_algs.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-19 19:55:47 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-19 19:55:47 +0000
commit2a4d0dcb89499854a51b20c4b80a355f5f34eb55 (patch)
treec20bad72d5af01b36f4977426e50928a9e5024ef /ssl/ssl_algs.c
parent2e155fde390cd0231f582c756a235dc2a8ee906d (diff)
The use of NIDs in the password based encryption table can result in
algorithms not found when an application uses PKCS#12 and only calls SSL_library_init() instead of OpenSSL_add_all_algorithms(). Simple work around is to add the missing algorithm (40 bit RC2) in SSL_library_init().
Diffstat (limited to 'ssl/ssl_algs.c')
-rw-r--r--ssl/ssl_algs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 640f6cff5c..a26ae43957 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -76,6 +76,10 @@ int SSL_library_init(void)
#endif
#ifndef OPENSSL_NO_RC2
EVP_add_cipher(EVP_rc2_cbc());
+ /* Not actually used for SSL/TLS but this makes PKCS#12 work
+ * if an application only calls SSL_library_init().
+ */
+ EVP_add_cipher(EVP_rc2_40_cbc());
#endif
#ifndef OPENSSL_NO_AES
EVP_add_cipher(EVP_aes_128_cbc());