summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/p5_crpt2.c
diff options
context:
space:
mode:
authorbeck <>2023-07-07 19:37:54 +0000
committerbeck <>2023-07-07 19:37:54 +0000
commit8d42940c1d19bb9bd4ce45580f18a59069225432 (patch)
treeb1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/p5_crpt2.c
parent1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff)
downloadopenbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz
openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2
openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.zip
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing. This unbreaks the namespace build so it will pass again ok tb@
Diffstat (limited to 'src/lib/libcrypto/evp/p5_crpt2.c')
-rw-r--r--src/lib/libcrypto/evp/p5_crpt2.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index a6fcc30fa4..3c66af9314 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.26 2023/07/07 13:54:46 beck Exp $ */ 1/* $OpenBSD: p5_crpt2.c,v 1.27 2023/07/07 19:37:54 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,7 +149,6 @@ 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}
152LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC);
153 152
154int 153int
155PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, 154PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
@@ -158,7 +157,6 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
158 return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, 157 return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
159 EVP_sha1(), keylen, out); 158 EVP_sha1(), keylen, out);
160} 159}
161LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC_SHA1);
162 160
163/* Now the key derivation function itself. This is a bit evil because 161/* Now the key derivation function itself. This is a bit evil because
164 * it has to check the ASN1 parameters are valid: and there are quite a 162 * it has to check the ASN1 parameters are valid: and there are quite a
@@ -220,7 +218,6 @@ err:
220 PBE2PARAM_free(pbe2); 218 PBE2PARAM_free(pbe2);
221 return rv; 219 return rv;
222} 220}
223LCRYPTO_ALIAS(PKCS5_v2_PBE_keyivgen);
224 221
225int 222int
226PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 223PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,