diff options
author | jsing <> | 2019-11-04 14:49:59 +0000 |
---|---|---|
committer | jsing <> | 2019-11-04 14:49:59 +0000 |
commit | 96ca5431d7a077073b68bc4028037880a2aaaa18 (patch) | |
tree | eccc63f9d825806cd6bcba6f942a708224bc1b38 /src | |
parent | 6647fb2956616da3bc45329a2a1cd62db868655b (diff) | |
download | openbsd-96ca5431d7a077073b68bc4028037880a2aaaa18.tar.gz openbsd-96ca5431d7a077073b68bc4028037880a2aaaa18.tar.bz2 openbsd-96ca5431d7a077073b68bc4028037880a2aaaa18.zip |
Remove engine argument from load_cert() calls.
This was cleaned up after cms went to the attic.
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/cms.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c index f31d2c4713..1658675e92 100644 --- a/src/usr.bin/openssl/cms.c +++ b/src/usr.bin/openssl/cms.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms.c,v 1.8 2019/11/04 14:47:43 jsing Exp $ */ | 1 | /* $OpenBSD: cms.c,v 1.9 2019/11/04 14:49:59 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -581,7 +581,7 @@ argerr: | |||
581 | encerts = sk_X509_new_null(); | 581 | encerts = sk_X509_new_null(); |
582 | while (*args) { | 582 | while (*args) { |
583 | if (!(cert = load_cert(bio_err, *args, FORMAT_PEM, | 583 | if (!(cert = load_cert(bio_err, *args, FORMAT_PEM, |
584 | NULL, e, "recipient certificate file"))) | 584 | NULL, "recipient certificate file"))) |
585 | goto end; | 585 | goto end; |
586 | sk_X509_push(encerts, cert); | 586 | sk_X509_push(encerts, cert); |
587 | cert = NULL; | 587 | cert = NULL; |
@@ -590,21 +590,21 @@ argerr: | |||
590 | } | 590 | } |
591 | if (certfile) { | 591 | if (certfile) { |
592 | if (!(other = load_certs(bio_err, certfile, FORMAT_PEM, NULL, | 592 | if (!(other = load_certs(bio_err, certfile, FORMAT_PEM, NULL, |
593 | e, "certificate file"))) { | 593 | "certificate file"))) { |
594 | ERR_print_errors(bio_err); | 594 | ERR_print_errors(bio_err); |
595 | goto end; | 595 | goto end; |
596 | } | 596 | } |
597 | } | 597 | } |
598 | if (recipfile && (operation == SMIME_DECRYPT)) { | 598 | if (recipfile && (operation == SMIME_DECRYPT)) { |
599 | if (!(recip = load_cert(bio_err, recipfile, FORMAT_PEM, NULL, | 599 | if (!(recip = load_cert(bio_err, recipfile, FORMAT_PEM, NULL, |
600 | e, "recipient certificate file"))) { | 600 | "recipient certificate file"))) { |
601 | ERR_print_errors(bio_err); | 601 | ERR_print_errors(bio_err); |
602 | goto end; | 602 | goto end; |
603 | } | 603 | } |
604 | } | 604 | } |
605 | if (operation == SMIME_SIGN_RECEIPT) { | 605 | if (operation == SMIME_SIGN_RECEIPT) { |
606 | if (!(signer = load_cert(bio_err, signerfile, FORMAT_PEM, NULL, | 606 | if (!(signer = load_cert(bio_err, signerfile, FORMAT_PEM, NULL, |
607 | e, "receipt signer certificate file"))) { | 607 | "receipt signer certificate file"))) { |
608 | ERR_print_errors(bio_err); | 608 | ERR_print_errors(bio_err); |
609 | goto end; | 609 | goto end; |
610 | } | 610 | } |
@@ -620,7 +620,7 @@ argerr: | |||
620 | keyfile = NULL; | 620 | keyfile = NULL; |
621 | 621 | ||
622 | if (keyfile) { | 622 | if (keyfile) { |
623 | key = load_key(bio_err, keyfile, keyform, 0, passin, e, | 623 | key = load_key(bio_err, keyfile, keyform, 0, passin, |
624 | "signing key file"); | 624 | "signing key file"); |
625 | if (!key) | 625 | if (!key) |
626 | goto end; | 626 | goto end; |
@@ -799,10 +799,10 @@ argerr: | |||
799 | signerfile = sk_OPENSSL_STRING_value(sksigners, i); | 799 | signerfile = sk_OPENSSL_STRING_value(sksigners, i); |
800 | keyfile = sk_OPENSSL_STRING_value(skkeys, i); | 800 | keyfile = sk_OPENSSL_STRING_value(skkeys, i); |
801 | signer = load_cert(bio_err, signerfile, FORMAT_PEM, | 801 | signer = load_cert(bio_err, signerfile, FORMAT_PEM, |
802 | NULL, e, "signer certificate"); | 802 | NULL, "signer certificate"); |
803 | if (!signer) | 803 | if (!signer) |
804 | goto end; | 804 | goto end; |
805 | key = load_key(bio_err, keyfile, keyform, 0, passin, e, | 805 | key = load_key(bio_err, keyfile, keyform, 0, passin, |
806 | "signing key file"); | 806 | "signing key file"); |
807 | if (!key) | 807 | if (!key) |
808 | goto end; | 808 | goto end; |