update as per review

siemens · Mar 7, 2024 · 6d0a000 · 6d0a000
1 parent a9e6f4d
commit 6d0a000
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/apps/cmp.c b/apps/cmp.c
@@ -472,7 +472,7 @@ const OPTIONS cmp_options[] = {
     OPT_SECTION("Credentials format"),
     {"certform", OPT_CERTFORM, 's',
      "Format (PEM or DER) to use when saving a certificate to a file. Default PEM"},
-     {"crlform", OPT_CRLFORM, 's',
+    {"crlform", OPT_CRLFORM, 's',
      "Format (PEM or DER) to use when saving a CRL to a file. Default DER"},
     {"keyform", OPT_KEYFORM, 's',
      "Format of the key input (ENGINE, other values ignored)"},
@@ -2824,6 +2824,7 @@ static int get_opts(int argc, char **argv)
         case OPT_CRLOUT:
             opt_crlout = opt_str();
             break;
+
         case OPT_V_CASES:
             if (!opt_verify(o, vpm))
                 goto opthelp;

diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
@@ -473,10 +473,8 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
             res = check_client_crl(crlstatuslist, ctx->crlOut);
             if (res < 0)
                 rsp = NULL;
-            else if (res == 0)
-                rsp = OSSL_CMP_ITAV_new_crls(NULL);
             else
-                rsp = OSSL_CMP_ITAV_new_crls(ctx->crlOut);
+                rsp = OSSL_CMP_ITAV_new_crls(res == 0 ? NULL : ctx->crlOut);
         }
         break;
     default:

diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
@@ -750,7 +750,7 @@ Any available distribution point name is preferred over issuer names.
 CRL used for specifying a CRL issuer when requesting a CRL 
 in a genm message with infoType C<crlStatusList>.
 Any available distribution point name is preferred over issuer names.
-If also -crlcrt is given, its data is preferred over data from -oldcrl.
+If also B<-crlcrt> is given, its data is preferred over data from B<-oldcrl>.
 
 =item B<-crlout> I<filename>
 

diff --git a/test/recipes/80-test_cmp_http_data/test_commands.csv b/test/recipes/80-test_cmp_http_data/test_commands.csv
@@ -90,7 +90,7 @@ expected,description, -section,val, -cmd,val,val2, -cacertsout,val,val2, -infoty
 1,genm crlStatusList with old crl        , -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -oldcrl, oldcrl.pem,,,,, -crlout, _RESULT_DIR/test.crlout2.pem
 1,genm crlStatusList with crlcert and old crl , -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -crlcert, signer_only.crt, -oldcrl, oldcrl.pem,,, -crlout, _RESULT_DIR/test.crlout3.pem
 1,genm crlStatusList with latest crl     , -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -oldcrl, _RESULT_DIR/test.crlout3.pem,,,,, -crlout, _RESULT_DIR/test.crlout4.pem
-0,genm crlStatusList with -oldcrl nonexistent, -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -oldcrl, _RESULT_DIR/test.crlout4.pem,,,,, -crlout, _RESULT_DIR/test.crlout.pem
+0,genm crlStatusList with -oldcrl nonexistent, -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -oldcrl, _RESULT_DIR/test.crlout4.pem,,,,, -crlout, _RESULT_DIR/test.crlout5.pem
 0,genm crlStatusList with -crlcert nonexistent, -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -crlcert, idontexist,,,,, -crlout, _RESULT_DIR/test.crlout.pem
 0,genm crlStatusList with wrong issuer, -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,, -crlcert, server.crt,,,,, -crlout, _RESULT_DIR/test.crlout.pem
 0,genm crlStatusList missing -crlcert & -oldcrl, -section,, -cmd,genm,, BLANK,,, -infotype,crlStatusList,,,,,,,, -crlout, _RESULT_DIR/test.crlout.pem