summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2026-05-09 10:52:02 +0000
committertb <>2026-05-09 10:52:02 +0000
commit64830621cb56680678319f406415b5b6ffe3b744 (patch)
treea617cd2311389c737ece6445806062f80061dfe9 /src/lib
parent52d8bfcb4d1e70d7ae25fba5e980177afcb56b0b (diff)
downloadopenbsd-64830621cb56680678319f406415b5b6ffe3b744.tar.gz
openbsd-64830621cb56680678319f406415b5b6ffe3b744.tar.bz2
openbsd-64830621cb56680678319f406415b5b6ffe3b744.zip
PKCS#12: fix erroneous error check in PKCS12_newpass()
This is an error I introduced in a refactoring two years ago in r1.20. This means that nothing uses this... From Frank Denis via logan
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_npas.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c
index c78deb9182..cf5d1ef9e0 100644
--- a/src/lib/libcrypto/pkcs12/p12_npas.c
+++ b/src/lib/libcrypto/pkcs12/p12_npas.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_npas.c,v 1.28 2025/05/10 05:54:38 tb Exp $ */ 1/* $OpenBSD: p12_npas.c,v 1.29 2026/05/09 10:52:02 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 */
@@ -276,11 +276,11 @@ PKCS12_newpass(PKCS12 *pkcs12, const char *oldpass, const char *newpass)
276 276
277 switch (OBJ_obj2nid(pkcs7->type)) { 277 switch (OBJ_obj2nid(pkcs7->type)) {
278 case NID_pkcs7_data: 278 case NID_pkcs7_data:
279 if (pkcs7_repack_data(pkcs7, safes, oldpass, newpass)) 279 if (!pkcs7_repack_data(pkcs7, safes, oldpass, newpass))
280 goto err; 280 goto err;
281 break; 281 break;
282 case NID_pkcs7_encrypted: 282 case NID_pkcs7_encrypted:
283 if (pkcs7_repack_encdata(pkcs7, safes, oldpass, newpass)) 283 if (!pkcs7_repack_encdata(pkcs7, safes, oldpass, newpass))
284 goto err; 284 goto err;
285 break; 285 break;
286 } 286 }