The branch openssl-3.0 has been updated via f2f2ac88499ad58546f9c5b19ebc0b6eddf0b49f (commit) from 4ed2db591a42fb99401f9b0ff17f6644797ae743 (commit)
- Log ----------------------------------------------------------------- commit f2f2ac88499ad58546f9c5b19ebc0b6eddf0b49f Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Tue Dec 7 11:35:42 2021 +0100 APPS/cmp: fix -rspin option such that it works again without -reqin Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17222) (cherry picked from commit 7ee0954a086ee3b4e0a8c6736600e3d6362485c0) ----------------------------------------------------------------------- Summary of changes: apps/cmp.c | 3 ++- test/recipes/80-test_cmp_http_data/test_commands.csv | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/cmp.c b/apps/cmp.c index 119419c5ef..d0f127d3ea 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -753,6 +753,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *req_new = NULL; OSSL_CMP_MSG *res = NULL; OSSL_CMP_PKIHEADER *hdr; + const char *prev_opt_rspin = opt_rspin; if (req != NULL && opt_reqout != NULL && !write_PKIMESSAGE(req, &opt_reqout)) @@ -782,7 +783,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx, if (res == NULL) goto err; - if (opt_reqin != NULL || opt_rspin != NULL) { + if (opt_reqin != NULL || prev_opt_rspin != NULL) { /* need to satisfy nonce and transactionID checks */ ASN1_OCTET_STRING *nonce; ASN1_OCTET_STRING *tid; 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 0bf1111a6c..7395b42791 100644 --- a/test/recipes/80-test_cmp_http_data/test_commands.csv +++ b/test/recipes/80-test_cmp_http_data/test_commands.csv @@ -53,3 +53,7 @@ expected,description, -section,val, -cmd,val,val2, -cacertsout,val,val2, -infoty 0,geninfo bad syntax: missing ':', -section,, -cmd,cr,, -cert,signer.crt, -key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int987,,,, 0,geninfo bad syntax: double ':', -section,, -cmd,cr,, -cert,signer.crt, -key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int::987,,,, 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,rspin, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/rsp1.der _RESULT_DIR/rsp2.der,,BLANK,,BLANK,