Latest update and remove TLSv1.3 draft

2019-02-09 20:33:39 +09:00
parent afcfc266de
commit d6aa4528fc
143 changed files with 3914 additions and 761 deletions
@@ -311,6 +311,13 @@ int pkcs12_main(int argc, char **argv)
    if (cpass != NULL) {
        mpass = cpass;
        noprompt = 1;
+        if (twopass) {
+            if (export_cert)
+                BIO_printf(bio_err, "Option -twopass cannot be used with -passout or -password\n");
+            else
+                BIO_printf(bio_err, "Option -twopass cannot be used with -passin or -password\n");
+            goto end;
+        }
    } else {
        cpass = pass;
        mpass = macpass;