From 5a1c70a3a2cf0a5bab4551cf531dc7541ff49d14 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 6 Dec 2024 07:10:20 +0000
Subject: Fix previous and thus regress failures reported by anton

Looks like I applied the diff to a dirty tree and didn't notice.
---
 src/lib/libcrypto/pkcs7/pk7_lib.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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 @@
-/* $OpenBSD: pk7_lib.c,v 1.29 2024/12/05 07:35:46 tb Exp $ */
+/* $OpenBSD: pk7_lib.c,v 1.30 2024/12/06 07:10:20 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -95,7 +95,8 @@ PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
 		break;
 	case PKCS7_OP_GET_DETACHED_SIGNATURE:
 		if (nid == NID_pkcs7_signed) {
-			if (p7->d.sign  || !p7->d.sign->contents->d.ptr)
+			if (p7->d.sign == NULL ||
+			    p7->d.sign->contents->d.ptr == NULL)
 				ret = 1;
 			else
 				ret = 0;
-- 
cgit v1.2.3-55-g6feb