summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2026-04-25 10:48:59 +0000
committertb <>2026-04-25 10:48:59 +0000
commitf0300b2a2410d7b9db8f0630f374ee53ceb5b49b (patch)
tree126f0742843a3329b7b71d1f799652027bbdf374 /src
parent0df5841c7025d30711720c0059366287156199ac (diff)
downloadopenbsd-f0300b2a2410d7b9db8f0630f374ee53ceb5b49b.tar.gz
openbsd-f0300b2a2410d7b9db8f0630f374ee53ceb5b49b.tar.bz2
openbsd-f0300b2a2410d7b9db8f0630f374ee53ceb5b49b.zip
pkcs7: avoid assignment to i in PKCS7_dataInit()
We can switch over the return value of OBJ_obj2nid() rather than using i for an indirection. ok jsing kenjiro
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_doit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index bd69d6f328..99fff03c0c 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_doit.c,v 1.63 2026/04/25 10:30:11 tb Exp $ */ 1/* $OpenBSD: pk7_doit.c,v 1.64 2026/04/25 10:48:59 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 *
@@ -276,10 +276,9 @@ PKCS7_dataInit(PKCS7 *p7, BIO *bio)
276 return NULL; 276 return NULL;
277 } 277 }
278 278
279 i = OBJ_obj2nid(p7->type);
280 p7->state = PKCS7_S_HEADER; 279 p7->state = PKCS7_S_HEADER;
281 280
282 switch (i) { 281 switch (OBJ_obj2nid(p7->type)) {
283 case NID_pkcs7_signed: 282 case NID_pkcs7_signed:
284 md_sk = p7->d.sign->md_algs; 283 md_sk = p7->d.sign->md_algs;
285 os = PKCS7_get_octet_string(p7->d.sign->contents); 284 os = PKCS7_get_octet_string(p7->d.sign->contents);