From: Richard Levitte <levitte@openssl.org>
Date: Wed, 9 Dec 2020 10:28:35 +0000 (+0100)
Subject: APPS: Correct the output structure for public keys in 'openssl rsa'
X-Git-Tag: openssl-3.0.0-alpha10~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=542b84881c33f0c9f67aa50b46557abd1ffba801;p=thirdparty%2Fopenssl.git

APPS: Correct the output structure for public keys in 'openssl rsa'

'openssl rsa' would output a PKCS#1 structure when asked for a
SubjectPublicKeyInfo and vice versa.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13645)
---

diff --git a/apps/rsa.c b/apps/rsa.c
index 469c09b97c7..bdfbcf07b86 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -310,9 +310,9 @@ int rsa_main(int argc, char **argv)
     if (outformat == FORMAT_ASN1 || outformat == FORMAT_PEM) {
         if (pubout || pubin) {
             if (pubout == 2)
-                output_structure = "SubjectPublicKeyInfo";
-            else
                 output_structure = "pkcs1"; /* "type-specific" would work too */
+            else
+                output_structure = "SubjectPublicKeyInfo";
         } else {
             assert(private);
             if (traditional)