Always load additional certificates if '-ac' option is defined

Author: max619

osslsigncode.c

@@ -4223,6 +4223,9 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
     options->xcerts = sk_X509_new_null();
     options->crls = sk_X509_CRL_new_null();
 
+    /* Load additional (cross) certificates ('-ac' option) */
+    load_objects_from_store(options->xcertfile, options->pass, NULL, options->xcerts, NULL);
+
     /* Try to use PKCS#12 container with certificates and the private key ('-pkcs12' option) */
     if (options->pkcs12file) {
         load_objects_from_store(options->pkcs12file, options->pass, &options->pkey, options->certs, options->crls);
@@ -4261,9 +4264,6 @@ static int read_crypto_params(GLOBAL_OPTIONS *options)
     }
 #endif /* OPENSSL_VERSION_NUMBER<0x1010108f */
 
-    /* Load additional (cross) certificates ('-ac' option) */
-    load_objects_from_store(options->xcertfile, options->pass, NULL, options->xcerts, NULL);
-
     /* Load the certificate chain ('-certs' option) */
     load_objects_from_store(options->certfile, options->pass, NULL, options->certs, NULL);