diff options
| author | Hubert Kario <hkario@redhat.com> | 2017-07-26 15:05:59 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-26 15:04:54 -0400 |
| commit | e15c95ce8596bcc2a5f5e163ff78ccf469dbf994 (patch) | |
| tree | e9c06483bc18465e6a08845a0080d5d73553e9b6 /util | |
| parent | 11a25d34549461ad6ddd61322ed3b54dd4c69686 (diff) | |
| download | openssl-e15c95ce8596bcc2a5f5e163ff78ccf469dbf994.tar.gz | |
make scrypt ASN.1 parameter functions public
Since scrypt PBKDF can be used both in PKCS#5 and PKCS#12 files,
do share the code between them.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1334)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index c103d12494..1c754b47a6 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4364,3 +4364,9 @@ EVP_sha3_384 4306 1_1_1 EXIST::FUNCTION: EVP_sha3_512 4307 1_1_1 EXIST::FUNCTION: EVP_shake128 4308 1_1_1 EXIST::FUNCTION: EVP_shake256 4309 1_1_1 EXIST::FUNCTION: +SCRYPT_PARAMS_new 4310 1_1_1 EXIST::FUNCTION:SCRYPT +SCRYPT_PARAMS_free 4311 1_1_1 EXIST::FUNCTION:SCRYPT +i2d_SCRYPT_PARAMS 4312 1_1_1 EXIST::FUNCTION:SCRYPT +d2i_SCRYPT_PARAMS 4313 1_1_1 EXIST::FUNCTION:SCRYPT +SCRYPT_PARAMS_it 4314 1_1_1 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:SCRYPT +SCRYPT_PARAMS_it 4314 1_1_1 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:SCRYPT |