diff options
author | tb <> | 2023-12-16 13:23:20 +0000 |
---|---|---|
committer | tb <> | 2023-12-16 13:23:20 +0000 |
commit | 7dbb67bb033c7b2d56630e14cd2e83a242b8f58d (patch) | |
tree | 901c400d49cb9d3278a40866c5f93ea476d551b4 /src | |
parent | 26b7f662a282a4d86a72d956c7f5a7256cb1666f (diff) | |
download | openbsd-7dbb67bb033c7b2d56630e14cd2e83a242b8f58d.tar.gz openbsd-7dbb67bb033c7b2d56630e14cd2e83a242b8f58d.tar.bz2 openbsd-7dbb67bb033c7b2d56630e14cd2e83a242b8f58d.zip |
Using two different spellings of NULL in the same line is an achievement
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/p5_crpt2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c index 3c66af9314..8e95613f6b 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.27 2023/07/07 19:37:54 beck Exp $ */ | 1 | /* $OpenBSD: p5_crpt2.c,v 1.28 2023/12/16 13:23:20 tb 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 | */ |
@@ -270,7 +270,7 @@ PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | |||
270 | else | 270 | else |
271 | prf_nid = NID_hmacWithSHA1; | 271 | prf_nid = NID_hmacWithSHA1; |
272 | 272 | ||
273 | if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, prf_nid, NULL, &hmac_md_nid, 0)) { | 273 | if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, prf_nid, NULL, &hmac_md_nid, NULL)) { |
274 | EVPerror(EVP_R_UNSUPPORTED_PRF); | 274 | EVPerror(EVP_R_UNSUPPORTED_PRF); |
275 | goto err; | 275 | goto err; |
276 | } | 276 | } |