diff options
Diffstat (limited to 'src/lib/libcrypto/evp/p5_crpt2.c')
-rw-r--r-- | src/lib/libcrypto/evp/p5_crpt2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c index 6c0cf529a4..a6fcc30fa4 100644 --- a/src/lib/libcrypto/evp/p5_crpt2.c +++ b/src/lib/libcrypto/evp/p5_crpt2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_crpt2.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */ | 1 | /* $OpenBSD: p5_crpt2.c,v 1.26 2023/07/07 13:54:46 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -149,6 +149,7 @@ PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, | |||
149 | HMAC_CTX_cleanup(&hctx_tpl); | 149 | HMAC_CTX_cleanup(&hctx_tpl); |
150 | return 1; | 150 | return 1; |
151 | } | 151 | } |
152 | LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC); | ||
152 | 153 | ||
153 | int | 154 | int |
154 | PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, | 155 | PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, |
@@ -157,6 +158,7 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, | |||
157 | return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, | 158 | return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, |
158 | EVP_sha1(), keylen, out); | 159 | EVP_sha1(), keylen, out); |
159 | } | 160 | } |
161 | LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC_SHA1); | ||
160 | 162 | ||
161 | /* Now the key derivation function itself. This is a bit evil because | 163 | /* Now the key derivation function itself. This is a bit evil because |
162 | * it has to check the ASN1 parameters are valid: and there are quite a | 164 | * it has to check the ASN1 parameters are valid: and there are quite a |
@@ -218,6 +220,7 @@ err: | |||
218 | PBE2PARAM_free(pbe2); | 220 | PBE2PARAM_free(pbe2); |
219 | return rv; | 221 | return rv; |
220 | } | 222 | } |
223 | LCRYPTO_ALIAS(PKCS5_v2_PBE_keyivgen); | ||
221 | 224 | ||
222 | int | 225 | int |
223 | PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | 226 | PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, |