From 6dbb277627de86578577185084378135605d2df1 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Tue, 4 May 2021 20:47:42 +0200
Subject: [PATCH] Tests for creating req from PKCS8 keys with extra attrs

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15142)
---
 test/recipes/25-test_req.t |  25 ++++++++++++++++++++++++-
 test/testrsa_withattrs.der | Bin 0 -> 1277 bytes
 test/testrsa_withattrs.pem |  29 +++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 test/testrsa_withattrs.der
 create mode 100644 test/testrsa_withattrs.pem

diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index 30c1c43a7f..0fcb56a46a 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -73,7 +73,7 @@ subtest "generating alt certificate requests with RSA" => sub {
 
 
 subtest "generating certificate requests with RSA" => sub {
-    plan tests => 3;
+    plan tests => 7;
 
     SKIP: {
         skip "RSA is not supported by this OpenSSL build", 2
@@ -97,6 +97,29 @@ subtest "generating certificate requests with RSA" => sub {
                     "-config", srctop_file("test", "test.cnf"),
                     "-verify", "-in", "testreq-rsa.pem", "-noout"])),
            "Verifying signature on request");
+
+        ok(run(app(["openssl", "req",
+                    "-config", srctop_file("test", "test.cnf"),
+                    "-new", "-out", "testreq_withattrs_pem.pem", "-utf8",
+                    "-key", srctop_file("test", "testrsa_withattrs.pem")])),
+           "Generating request from a key with extra attributes - PEM");
+
+        ok(run(app(["openssl", "req",
+                    "-config", srctop_file("test", "test.cnf"),
+                    "-verify", "-in", "testreq_withattrs_pem.pem", "-noout"])),
+           "Verifying signature on request from a key with extra attributes - PEM");
+
+        ok(run(app(["openssl", "req",
+                    "-config", srctop_file("test", "test.cnf"),
+                    "-new", "-out", "testreq_withattrs_der.pem", "-utf8",
+                    "-key", srctop_file("test", "testrsa_withattrs.der"),
+	            "-keyform", "DER"])),
+           "Generating request from a key with extra attributes - PEM");
+
+        ok(run(app(["openssl", "req",
+                    "-config", srctop_file("test", "test.cnf"),
+                    "-verify", "-in", "testreq_withattrs_der.pem", "-noout"])),
+           "Verifying signature on request from a key with extra attributes - PEM");
     }
 };
 
diff --git a/test/testrsa_withattrs.der b/test/testrsa_withattrs.der
new file mode 100644
index 0000000000000000000000000000000000000000..811e1e0bcb003c43a63cf19dbe4ed46c483590fe
GIT binary patch
literal 1277
zcmV<Z1Oodof&}>j0RS)!1_>&LNQU<f0RaI800e>rsW5^Br2+u}0)hbn0PKgf7RDFt
zuBqTeEzGmw@gHMF34Lrvh=^B*7%Ob_4F^Ps+C_Ge<#NsNc{{Fk%4_j^tFnhx6vV-J
zc+ol-Fgx<o_Y__cNSdH>V1E9JaHla6`RxicB+O`J!%fZ~l~{Jv(E+?E!Nx6ux(|t+
zl1zhXK<R~PyxNQ6zTUT8!7-$f#<vTZ80@2rmV137>*mSHEJmUFF!HlMlpD_3U}N5E
zwzj@FOv){UHM<_6k)<W46!~~!pUsC{a{`H3tsPN(lmEebu9W6wy!QteN*D!<%LbEv
z9&*AHW>nPPBI&Uq7dQCwC!b2{DK>+xY^BB^U2l7K?0irnaM_sr9RdRZ009Dm0RaHS
z(XTUnClM;tM8CH5t%8SWJnV;;3~(&acQpMGwVCGib36r<<FiMgo@q)LHFe^+tGeR`
zt-?ry=@HyV4fbxlleKx)Lg-TH2sY%w2m&7WpvX^~#c$eY6+bhb9JT*S8>hcJm|c$6
z->ddBQ>p;L7GRMXKw#QCX-9_GK=BJ^HOvh6ESTwLY!__F3*(gG>RvFYQEUzf5gB&Y
zi_aF0KCo8gn0AMC^VXGjHP(N|=fGhYX(g$THYB2@7oi1^9zgw>10m!8oOiYX90TCA
z;HbPd`>-b;`cL^rC_lBwaLTfHjf<zmY-wppKiQ{InBi=dJ<7{#!g0v&lxhJ2fq?+}
z3&8}Bi%70sob~QniUdIYdwi_jWNyNV&l7z!+q4oKUNcY>vEvqiO_Suo6e!u5uFLuH
z94Wx&_!u>*t}%)ekLVf@sCC(7)_(PsJ?O*cBi38%K#UvNOx0CkN~-4CebD;XpP}E{
z*|a31KM=9nY*1R26d`$+<lE|6c0k<%fq?+>DUT9qdMs`EvT#_`eyz|1f*n0*717V5
zO;#xetp3}JJL*h*n!wXC*#t~+X5|T%fVv3l6L9L~E9gcutpIPN;7In=y^4qPBNgo?
z3%(bGo(hPFQ8Ac!JN9g6%FWS&|4K6u71)Y)z#73b1rBLMRQ8n$UQ!LlCX~7B(o{hL
zfq?+fHtTZD$x$ncGq3{OH{+D<zh1Fl<{Ifa@=B{te4F(g)Ie-y-#=GmUA0o4i5LGP
zA5c+%I#70oo_``}dRkmPFYh^xH;Qu&sw1p|t2^PX37DObM}DME4bk(s0fJDR4tnqQ
zkHRkVL8s+@UaXrvWJZBEbiD6S(amDm6LPHrfq*7DomGIvLc&qX^QCfDRYoI_4&kKE
z-2!xbKLFPT^lacfBQDe(To-#ydpbTO%0G)d;~|Mk)@GioA<hF<YF#y;8l<ev2UC*t
zl>dz+32a#jLJV)nv6ZS-eE)nKE(XUjS{qr6xm1#lohqiyLyIQ3YW(<E4~P*W0u-OW
z;(-EzfdHwts?iYYy?t=Rri{Yh)XU=V>nN3}2V08jkVK9F6%YTdas1*`-ZYPxXEadM
zyZ<D|8h!taJec_1CqRXTVlS<Btd4obdK|hT>=p`G%^#4TIL^4NIu~ePgh+!ptguII
z4+>)Tijc_8annI0ZEQtlRMSu}5*hEsEpu-mZHk~cFg6AVDun|A2?GcLF)9Qo8lp($
n=JLKs?hyd`2qicBG;Op(pE@ZL8-${|T%0xQlGSaE3g$8`R#sqj

literal 0
HcmV?d00001

diff --git a/test/testrsa_withattrs.pem b/test/testrsa_withattrs.pem
new file mode 100644
index 0000000000..42d0a3c51c
--- /dev/null
+++ b/test/testrsa_withattrs.pem
@@ -0,0 +1,29 @@
+-----BEGIN PRIVATE KEY-----
+MIIE+QIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDsh7QWxhftrqng
+RC3Ms+HxH2NFCX1sRoiIV4cYK2z0DQdEiNpFdpHlcs3weTuudcpr8XursodVFMTB
+eHjROhgwO/LT9xReEUiaoHJgfv6KcKcxEvntCjQkzGhkw03OH5VYdtTRAbwpwcYt
+groPiZ2STINpQOmFabzai+K+3rddwTGkkca3C5kY7KOMlnt9IuvmycksRqH6MPKz
+P5QbztlgY95rtra+OEzKLYQ1ux6hkaUlpxT5eGKfzYdccwKJWa0dUXyT/8F6rpTm
+Zbz3BxdKGAWMywaTfh5ywhNmVNTeIumxIRc3+PInn0rqKTaDrWylxiBdb3t27HxQ
+InDZmPwdAgMBAAECggEBAMTRrzN8JxEq1ES/tvStgodoPOyHlwxwLNB3NP0RtZnm
+9XM8BZTjs0egnmlKGDV14riruuMGrcJIg+kR3EcN9m68k7V51kLoUugINuTBCAIe
+96DIT5vFb9pnFT8znRy1/0obp787mF2O1t+r9jNTqgDBFmCRGUBg2jtpR4bYQPEL
+ZjXMDPcsmOlmbBdsyQvjlOHqXjCoUWwOCBEZdtaLzxaOPrBW5Jh2h3Xz1pV3NdZ/
+xufAYRhpJamPNiSipRehBZAeQP2ZAyHj/5x3tgEcA+C04Ki8NvuwJx/6T/lGKD+1
+x3DKsniNi6fEbGlpST/Zp1GY4WyVPcrLa8JxyO+UagECgYEA+gvBBI+LSK5enPXu
+WooEQP17fKzdZG7Cic8TfTPbtBIcXjNQFLHjFoBNk+TBFCjZma7L+fEcKcDm+Bg1
+qa4xihOP6BoQqHXZZNZ+9ZU96MPmI9Zb60CMG9lM1VVhSqrm2n3Q+tefod/a2bQk
+oz8QsdpsUFqVFCF5l+Tb6lp2QN0CgYEA8imPEml6LG35snBY1H6t0ASCHT1oFdHP
+o01WKQas/tuLO+pMfZrA0zLZBExxZuUJloC6COsTcOrlK+hGM60Ab6TgSPbUvYqH
+8yMV7SYLvheEngqIiFExmHg79mxnys3Rgv9KMxAV2Ip2wBrBMwUOaURU9pUKXlIN
+xiaUuevSVEECgYEA0Dbrcs3JUSuKM7AC3DfjlO6/XrFf5hrpOfJKq058m/Uc1EBs
+Zd8/V2RdtVKeiRf/Ix9QUYA6UHaGnn8iaHpaXD0v7zmNN4pzDaojrIKrO+GtCZid
+kEd+pE4N0fO4AYJQnA567/aPwi7zQaflfl6smz1kRoE3dLzvUNHNYtgTcq0CgYAm
+Op1VgMVCwlHK86VyVlVGI5AO4aTO3QJ0ez8A1wb0bOA8Iy7UHVwXe017Oj4kyj+L
+POMhiUrWZp6rIc4DVmpdNaAapKzNB1OS9JT/jSQJbFkJQgxvyLGVqlV8/3wbLgbH
+MVobWYy5VJKOnSqmzUOLJrhq/PhYD4gRIgIUn7/igQKBgQCptqrREOq9fXDEpozC
+39TL4vDrKJWpB1uK6pBEjgEVD/+tcfziVN40j5hnNFDUu/8kxxp9/4w8mPjdJ0CF
+hWIvrXasjnnFehy6IewWCljNH5CfOM64rDoXaF+ESIM4rLBHbQ8KYvaKkMjOcdNB
+JG1sRWVU01AwEhnvxS1zbyBtiqA4MDYGCCqFAwIJAwgBMSoEKBqiSOXm8r5I7hEA
++gglN/s0bbRCnzopEhuEorpcnDXrktVtjQrmMi0=
+-----END PRIVATE KEY-----