From 6995026525eddb14bb78d93dda67cee4c3042aaa Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 25 Apr 2026 10:48:59 +0000 Subject: [PATCH] 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 --- lib/libcrypto/pkcs7/pk7_doit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libcrypto/pkcs7/pk7_doit.c b/lib/libcrypto/pkcs7/pk7_doit.c index bd69d6f328a..99fff03c0c2 100644 --- a/lib/libcrypto/pkcs7/pk7_doit.c +++ b/lib/libcrypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.63 2026/04/25 10:30:11 tb Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.64 2026/04/25 10:48:59 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -276,10 +276,9 @@ PKCS7_dataInit(PKCS7 *p7, BIO *bio) return NULL; } - i = OBJ_obj2nid(p7->type); p7->state = PKCS7_S_HEADER; - switch (i) { + switch (OBJ_obj2nid(p7->type)) { case NID_pkcs7_signed: md_sk = p7->d.sign->md_algs; os = PKCS7_get_octet_string(p7->d.sign->contents);