diff options
author | inoguchi <> | 2022-03-28 10:56:26 +0000 |
---|---|---|
committer | inoguchi <> | 2022-03-28 10:56:26 +0000 |
commit | 6dc9250b350dacab31d1201dbb40c44de4d9de22 (patch) | |
tree | bb024f2c50002537f871a5d3b277e3128cc981fe /src/usr.bin | |
parent | ff309a73206fdbb92a6f920a1451a058c97f77dc (diff) | |
download | openbsd-6dc9250b350dacab31d1201dbb40c44de4d9de22.tar.gz openbsd-6dc9250b350dacab31d1201dbb40c44de4d9de22.tar.bz2 openbsd-6dc9250b350dacab31d1201dbb40c44de4d9de22.zip |
Remove unused function cert_load in openssl(1) pkcs12
ok tb@
Diffstat (limited to 'src/usr.bin')
-rw-r--r-- | src/usr.bin/openssl/pkcs12.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c index e1a89211c0..8d1ae415fa 100644 --- a/src/usr.bin/openssl/pkcs12.c +++ b/src/usr.bin/openssl/pkcs12.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs12.c,v 1.16 2021/10/31 16:47:27 tb Exp $ */ | 1 | /* $OpenBSD: pkcs12.c,v 1.17 2022/03/28 10:56:26 inoguchi 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 | */ |
@@ -88,7 +88,6 @@ int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst, | |||
88 | const char *name); | 88 | const char *name); |
89 | void hex_prin(BIO *out, unsigned char *buf, int len); | 89 | void hex_prin(BIO *out, unsigned char *buf, int len); |
90 | int alg_print(BIO *x, const X509_ALGOR *alg); | 90 | int alg_print(BIO *x, const X509_ALGOR *alg); |
91 | int cert_load(BIO *in, STACK_OF(X509) *sk); | ||
92 | static int set_pbe(BIO *err, int *ppbe, const char *str); | 91 | static int set_pbe(BIO *err, int *ppbe, const char *str); |
93 | 92 | ||
94 | static struct { | 93 | static struct { |
@@ -1006,23 +1005,6 @@ alg_print(BIO *x, const X509_ALGOR *alg) | |||
1006 | return 1; | 1005 | return 1; |
1007 | } | 1006 | } |
1008 | 1007 | ||
1009 | /* Load all certificates from a given file */ | ||
1010 | |||
1011 | int | ||
1012 | cert_load(BIO *in, STACK_OF(X509) *sk) | ||
1013 | { | ||
1014 | int ret; | ||
1015 | X509 *cert; | ||
1016 | ret = 0; | ||
1017 | while ((cert = PEM_read_bio_X509(in, NULL, NULL, NULL))) { | ||
1018 | ret = 1; | ||
1019 | sk_X509_push(sk, cert); | ||
1020 | } | ||
1021 | if (ret) | ||
1022 | ERR_clear_error(); | ||
1023 | return ret; | ||
1024 | } | ||
1025 | |||
1026 | /* Generalised attribute print: handle PKCS#8 and bag attributes */ | 1008 | /* Generalised attribute print: handle PKCS#8 and bag attributes */ |
1027 | void | 1009 | void |
1028 | print_attribute(BIO *out, const ASN1_TYPE *av) | 1010 | print_attribute(BIO *out, const ASN1_TYPE *av) |