certtool: do not require a certificate to generate a PKCS#12 file

That is, allow generating PKCS#12 files with private keys only as well.

diff --git a/src/certtool-args.def b/src/certtool-args.def
index 29835f8fe4a067c34e210a0b6183d8f4790eec7c..c3acef5ac364a526c2357a092c5a9d092efadec3 100644 (file)
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -408,7 +408,6 @@ flag = {
     name      = to-p12;
     descrip   = "Generate a PKCS #12 structure";
     doc = "It requires a certificate, a private key and possibly a CA certificate to be specified.";
-    flags-must = load-certificate;
 };
 
 flag = {

diff --git a/src/certtool.c b/src/certtool.c
index e27f05509339d2d565227e8b20e6f3a589157e4f..ecc1393bcc4bee5b153d836135046985082964bc 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3105,6 +3105,11 @@ void generate_pkcs12(common_info_st * cinfo)
        crts = load_cert_list(0, &ncrts, cinfo);
        ca_crt = load_ca_cert(0, cinfo);
 
+       if (keys == NULL && crts == NULL && ca_crt == NULL) {
+               fprintf(stderr, "You must specify one of\n\t--load-privkey\n\t--load-certificate\n\t--load-ca-certificate\n");
+               exit(1);
+       }
+
        if (HAVE_OPT(P12_NAME)) {
                name = OPT_ARG(P12_NAME);
        } else {