From: tb <tb@openbsd.org>
Date: Sat, 16 Dec 2023 13:23:20 +0000 (+0000)
Subject: Using two different spellings of NULL in the same line is an achievement
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=deb6d9cd14a50c7b43d6cb02a8eb980ccb6b6ebb;p=openbsd

Using two different spellings of NULL in the same line is an achievement
---

diff --git a/lib/libcrypto/evp/p5_crpt2.c b/lib/libcrypto/evp/p5_crpt2.c
index 3c66af9314f..8e95613f6b8 100644
--- a/lib/libcrypto/evp/p5_crpt2.c
+++ b/lib/libcrypto/evp/p5_crpt2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_crpt2.c,v 1.27 2023/07/07 19:37:54 beck Exp $ */
+/* $OpenBSD: p5_crpt2.c,v 1.28 2023/12/16 13:23:20 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -270,7 +270,7 @@ PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 	else
 		prf_nid = NID_hmacWithSHA1;
 
-	if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, prf_nid, NULL, &hmac_md_nid, 0)) {
+	if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, prf_nid, NULL, &hmac_md_nid, NULL)) {
 		EVPerror(EVP_R_UNSUPPORTED_PRF);
 		goto err;
 	}