aboutsummaryrefslogtreecommitdiffstats
path: root/ext/openssl/ossl.c
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-12-09 20:16:59 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-03-23 18:34:42 +0900
commit36cf2f0ff6da245b7f1d705bc516da5ef775eeeb (patch)
treeb4a30950cb12e50b82ea934eea5cb161c78f8254 /ext/openssl/ossl.c
parent7b0ae4541c66ce228ba4abd75c8f35be177dc8f8 (diff)
downloadruby-openssl-36cf2f0ff6da245b7f1d705bc516da5ef775eeeb.tar.gz
kdf: introduce OpenSSL::KDF module
Introduce a new OpenSSL::KDF module as a namespace for to-be-added KDFs. This makes it easier to add new KDFs in future. We already have a stand-alone KDF, OpenSSL::PKCS5.pbkdf2_hmac. This is migrated to the new namespace. The backwards compatibility is retained by the method defined in the newly added lib/openssl/pkcs5.rb.
Diffstat (limited to 'ext/openssl/ossl.c')
-rw-r--r--ext/openssl/ossl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index bcadc3e1..793eb729 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -1169,7 +1169,6 @@ Init_openssl(void)
Init_ossl_ns_spki();
Init_ossl_pkcs12();
Init_ossl_pkcs7();
- Init_ossl_pkcs5();
Init_ossl_pkey();
Init_ossl_rand();
Init_ossl_ssl();
@@ -1177,6 +1176,7 @@ Init_openssl(void)
Init_ossl_ocsp();
Init_ossl_engine();
Init_ossl_asn1();
+ Init_ossl_kdf();
#if defined(OSSL_DEBUG)
/*