1 files changed, 6 insertions, 15 deletions

diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index cc9da46439..4b27a4ddbe 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_req.c,v 1.21 2021/12/25 13:17:48 jsing Exp $ */
+/* $OpenBSD: t_req.c,v 1.22 2022/05/09 19:19:33 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -176,7 +176,6 @@ X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                                 ASN1_TYPE *at;
                                 X509_ATTRIBUTE *a;
                                 ASN1_BIT_STRING *bs = NULL;
-                                ASN1_TYPE *t;
                                 int j, type = 0, count = 1, ii = 0;
 
                                 a = sk_X509_ATTRIBUTE_value(sk, i);
@@ -186,20 +185,12 @@ X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                                 if (BIO_printf(bp, "%12s", "") <= 0)
                                         goto err;
                                 if ((j = i2a_ASN1_OBJECT(bp, a->object)) > 0) {
-                                        if (a->single) {
-                                                t = a->value.single;
-                                                type = t->type;
-                                                bs = t->value.bit_string;
-                                        } else {
-                                                ii = 0;
-                                                count = sk_ASN1_TYPE_num(
-                                                    a->value.set);
+                                        ii = 0;
+                                        count = sk_ASN1_TYPE_num(a->set);
  get_next:
-                                                at = sk_ASN1_TYPE_value(
-                                                    a->value.set, ii);
-                                                type = at->type;
-                                                bs = at->value.asn1_string;
-                                        }
+                                        at = sk_ASN1_TYPE_value(a->set, ii);
+                                        type = at->type;
+                                        bs = at->value.asn1_string;
                                 }
                                 for (j = 25 - j; j > 0; j--)
                                         if (BIO_write(bp, " ", 1) != 1)