diff options
| author | beck <> | 2023-07-07 19:37:54 +0000 |
|---|---|---|
| committer | beck <> | 2023-07-07 19:37:54 +0000 |
| commit | 1ca8095297adf80b48019b5a2d18010ff9e3427f (patch) | |
| tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/evp/p5_crpt2.c | |
| parent | 66ac57d506be0af957abeb5a5a7334a8d2a36c9b (diff) | |
| download | openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.gz openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.tar.bz2 openbsd-1ca8095297adf80b48019b5a2d18010ff9e3427f.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.c | 5 |
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 | } |
| 152 | LCRYPTO_ALIAS(PKCS5_PBKDF2_HMAC); | ||
| 153 | 152 | ||
| 154 | int | 153 | int |
| 155 | PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, | 154 | PKCS5_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 | } |
| 161 | LCRYPTO_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 | } |
| 223 | LCRYPTO_ALIAS(PKCS5_v2_PBE_keyivgen); | ||
| 224 | 221 | ||
| 225 | int | 222 | int |
| 226 | PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | 223 | PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, |
