summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-12-06 07:10:20 +0000
committertb <>2024-12-06 07:10:20 +0000
commit5a1c70a3a2cf0a5bab4551cf531dc7541ff49d14 (patch)
treec132c1ea5a48792eee4c2e1e341ee8664589de37 /src
parent95d8ba55835868f64e2ae1cb79dff4531fb6ba04 (diff)
downloadopenbsd-5a1c70a3a2cf0a5bab4551cf531dc7541ff49d14.tar.gz
openbsd-5a1c70a3a2cf0a5bab4551cf531dc7541ff49d14.tar.bz2
openbsd-5a1c70a3a2cf0a5bab4551cf531dc7541ff49d14.zip
Fix previous and thus regress failures reported by anton
Looks like I applied the diff to a dirty tree and didn't notice.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index aa48c269ea..a1c7d61cca 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_lib.c,v 1.29 2024/12/05 07:35:46 tb Exp $ */ 1/* $OpenBSD: pk7_lib.c,v 1.30 2024/12/06 07:10:20 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -95,7 +95,8 @@ PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
95 break; 95 break;
96 case PKCS7_OP_GET_DETACHED_SIGNATURE: 96 case PKCS7_OP_GET_DETACHED_SIGNATURE:
97 if (nid == NID_pkcs7_signed) { 97 if (nid == NID_pkcs7_signed) {
98 if (p7->d.sign || !p7->d.sign->contents->d.ptr) 98 if (p7->d.sign == NULL ||
99 p7->d.sign->contents->d.ptr == NULL)
99 ret = 1; 100 ret = 1;
100 else 101 else
101 ret = 0; 102 ret = 0;