The branch master has been updated
via 20b0579cbfd1986d00ad8eb2167bc865519f23cd (commit)
via 22dd3f8b273b18fc20f0650b5a19166eda1950ee (commit)
via 7e5be5c3267dc90a77d243d900448c3a62c0b1c9 (commit)
from edc8566f475d63278d5f85cd25f324cf2fe9aaf9 (commit)
- Log -----------------------------------------------------------------
commit 20b0579cbfd1986d00ad8eb2167bc865519f23cd
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: Thu Dec 9 20:28:08 2021 +0100
CMP test_commands.csv: improve test for -reqin, adding -reqin_new_tid
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17252)
commit 22dd3f8b273b18fc20f0650b5a19166eda1950ee
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: Thu Dec 9 20:25:19 2021 +0100
CMP test_verification.csv: add missing test case for -untrusted with
non-matching cert
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17252)
commit 7e5be5c3267dc90a77d243d900448c3a62c0b1c9
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: Thu Dec 9 12:40:08 2021 +0100
CMP test_enrollment.csv: clean up test cases regarding (non-existing)
directories
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17252)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/80-test_cmp_http_data/test_commands.csv | 4 ++--
test/recipes/80-test_cmp_http_data/test_enrollment.csv | 8 ++++----
test/recipes/80-test_cmp_http_data/test_verification.csv | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/test/recipes/80-test_cmp_http_data/test_commands.csv
b/test/recipes/80-test_cmp_http_data/test_commands.csv
index ce12de4a8b..0a9ad1a5f5 100644
--- a/test/recipes/80-test_cmp_http_data/test_commands.csv
+++ b/test/recipes/80-test_cmp_http_data/test_commands.csv
@@ -1,4 +1,4 @@
-expected,description, -section,val, -cmd,val,val2, -cacertsout,val,val2,
-infotype,val,, -oldcert,val, -revreason,int, -geninfo,val
+expected,description, -section,val, -cmd,val,val2, -cacertsout,val,val2,
-infotype,val,, -oldcert,val, -revreason,int, -geninfo,val,-reqin_new_tid
,,,,,Generic,message options:,,,,,,,,Misc,request options:,,
,,,,,,,,,,,,,,,,,
1,minimum options, -section,, -cmd,ir,,BLANK,,,BLANK,,,BLANK,,BLANK,
@@ -55,5 +55,5 @@ expected,description, -section,val, -cmd,val,val2,
-cacertsout,val,val2, -infoty
0,geninfo bad syntax: missing ':int', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3,,,,
,,,,,,,,,,,,,,,,,,,
1,reqout+rspout, -section,, -cmd,ir,,-reqout,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,-rspout,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
-1,reqin, -section,, -cmd,ir,,-reqin,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,BLANK,,,BLANK,,BLANK,
+1,reqin, -section,, -cmd,ir,,-reqin,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,BLANK,,,BLANK,,BLANK,-reqin_new_tid
1,rspin, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
diff --git a/test/recipes/80-test_cmp_http_data/test_enrollment.csv
b/test/recipes/80-test_cmp_http_data/test_enrollment.csv
index 358521de28..53bb162b9e 100644
--- a/test/recipes/80-test_cmp_http_data/test_enrollment.csv
+++ b/test/recipes/80-test_cmp_http_data/test_enrollment.csv
@@ -3,7 +3,7 @@ expected,description, -section,val, -cmd,val, -newkey,val,val,
-newkeypass,val,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1,newkey, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
0,newkey missing arg, -section,, -cmd,ir, -newkey,,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey1.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
-0,newkey is directory, -section,, -cmd,ir, -newkey,dir/,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey2.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
+0,newkey is non-existing directory and file, -section,, -cmd,ir,
-newkey,idontexist/idontexist,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey2.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
0,newkey too many parameters, -section,, -cmd,ir, -newkey,abc,def,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey3.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
0,newkey is an RSA key, -section,, -cmd,ir, -newkey,test.RSA2048.pem,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_newkey4.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -65,12 +65,13 @@ expected,description, -section,val, -cmd,val,
-newkey,val,val, -newkeypass,val,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
0,no certout, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,"""",, -out_trusted,root.crt,,BLANK,,BLANK,,,
0,certout missing arg, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,,, -out_trusted,root.crt,,BLANK,,BLANK,,,
+0,certout is non-existing directory and file, -section,, -cmd,ir,
-newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,idontexist/idontexist,, -out_trusted,root.crt,,BLANK,,BLANK,,,
0,certout too many parameters, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,abc,def, -out_trusted,root.crt,,BLANK,,BLANK,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1,no out_trusted, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted.pem,,BLANK,,,BLANK,,BLANK,,,
1,out_trusted bigcert, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted_big.pem,,
-out_trusted,big_root.crt,,BLANK,,BLANK,,,
0,out_trusted missing arg, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted1.pem,,
-out_trusted,,,BLANK,,BLANK,,,
-0,out_trusted is directory, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted2.pem,,
-out_trusted,dir/,,BLANK,,BLANK,,,
+0,out_trusted is non-existing file, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted2.pem,,
-out_trusted,idontexist,,BLANK,,BLANK,,,
0,out_trusted too many parameters, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted3.pem,,
-out_trusted,abc,def,BLANK,,BLANK,,,
0,out_trusted empty certificate file, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted4.pem,,
-out_trusted,empty.txt,,BLANK,,BLANK,,,
0,out_trusted expired ca certificate, -section,, -cmd,ir, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_out_trusted5.pem,,
-out_trusted,root_expired.crt,,BLANK,,BLANK,,,
@@ -87,7 +88,6 @@ expected,description, -section,val, -cmd,val,
-newkey,val,val, -newkeypass,val,
1,p10cr csr present, -section,, -cmd,p10cr,BLANK,,,
BLANK,,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr.pem,, -out_trusted,root.crt,,BLANK,,
-csr,csr.pem,,
0,p10cr csr missing, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr1.pem,,
-out_trusted,root.crt,,BLANK,,BLANK,,,
0,p10cr csr missing arg, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr1.pem,, -out_trusted,root.crt,,BLANK,,
-csr,,,
-0,p10cr csr directory, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr2.pem,, -out_trusted,root.crt,,BLANK,,
-csr,dir/,,
0,p10cr csr non-existing file, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr3.pem,, -out_trusted,root.crt,,BLANK,,
-csr,idontexist,,
0,p10cr csr empty file, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr4.pem,, -out_trusted,root.crt,,BLANK,,
-csr,empty.txt,,
TODO,p10cr wrong csr, -section,, -cmd,p10cr, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_p10cr5.pem,, -out_trusted,root.crt,,BLANK,,
-csr,wrong_csr.pem,,
@@ -101,7 +101,7 @@ TODO,p10cr wrong csr, -section,, -cmd,p10cr,
-newkey,new.key,, -newkeypass,pass:
1,kur explicit options, -section,, -cmd,kur, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT,
-cert,_RESULT_DIR/test.certout_newkey.pem, -key,new.key,
-extracerts,issuing.crt
1,kur minimal options, -section,, -cmd,kur,BLANK,,BLANK,,
-subject,"""",BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur_minimal.pem,,BLANK,,,
-oldcert,"""",BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT,
-cert,_RESULT_DIR/test.certout_newkey.pem, -key,new.key,
-extracerts,issuing.crt, -secret,""""
0,kur newkey value missing, -section,, -cmd,kur, -newkey,,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur1.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
-0,kur newkey is directory, -section,, -cmd,kur, -newkey,dir/,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur2.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
+0,kur newkey is non-existing directory and file, -section,, -cmd,kur,
-newkey,idontexist/idontexist,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur2.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
0,kur newkey parameter count no match, -section,, -cmd,kur, -newkey,abc,def,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur3.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
0,kur newkey missing argument, -section,, -cmd,kur, -newkey,BLANK,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur4.pem,, -out_trusted,root.crt,,
-oldcert,_RESULT_DIR/test.certout_newkey.pem,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
0,kur oldcert not existing, -section,, -cmd,kur, -newkey,new.key,,
-newkeypass,pass:,,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,BLANK,,
-certout,_RESULT_DIR/test.certout_kur6.pem,, -out_trusted,root.crt,,
-oldcert,idontexist,BLANK,,,,,-server,_SERVER_HOST:_KUR_PORT
diff --git a/test/recipes/80-test_cmp_http_data/test_verification.csv
b/test/recipes/80-test_cmp_http_data/test_verification.csv
index ad28108be2..75ffe267c3 100644
--- a/test/recipes/80-test_cmp_http_data/test_verification.csv
+++ b/test/recipes/80-test_cmp_http_data/test_verification.csv
@@ -35,6 +35,7 @@ expected,description, -section,val, -recipient,val,
-expect_sender,val, -srvcert
0,trusted file does not exist, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,idontexist,BLANK,,BLANK, -unprotected_errors,BLANK,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,,,,
0,untrusted missing arg, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,trusted.crt, -untrusted,,BLANK, -unprotected_errors,BLANK,,,,,,,,
+1,untrusted not matching cert, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,trusted.crt, -untrusted,root.crt,BLANK,
-unprotected_errors,BLANK,,,,,,,,
0,untrusted empty file, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,trusted.crt, -untrusted,empty.txt,BLANK,
-unprotected_errors,BLANK,,,,,,,,
0,untrusted random file, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,trusted.crt, -untrusted,random.bin,BLANK,
-unprotected_errors,BLANK,,,,,,,,
0,untrusted file does not exist, -section,, -recipient,_CA_DN,BLANK,,BLANK,,
-trusted,trusted.crt, -untrusted,idontexist,BLANK,
-unprotected_errors,BLANK,,,,,,,,
