summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkcs12.c
diff options
context:
space:
mode:
authorjsing <>2015-08-22 16:36:05 +0000
committerjsing <>2015-08-22 16:36:05 +0000
commit3d9f323c9126c3921ff102a172c67dfa4975449a (patch)
tree914abdd328ee31b3be41e0883b0af14975b39f57 /src/usr.bin/openssl/pkcs12.c
parent8aaa3462961697bb402dbd95d36536a55500e050 (diff)
downloadopenbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.tar.gz
openbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.tar.bz2
openbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.zip
Remove all duplicate prototypes for *_main functions (these are already
provided by progs.h). Also, move the FUNCTION type (and flags) into openssl.c since that is the only place of use. Lastly, remove pointless 'extern' from the prototypes and use char **argv instead of char *argv[] (the former is used elsewhere). ok deraadt@ doug@
Diffstat (limited to 'src/usr.bin/openssl/pkcs12.c')
-rw-r--r--src/usr.bin/openssl/pkcs12.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index 41924a9698..901ddc05f3 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.2 2014/08/28 14:23:52 jsing Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.3 2015/08/22 16:36:05 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 */
@@ -92,8 +92,6 @@ int alg_print(BIO * x, X509_ALGOR * alg);
92int cert_load(BIO * in, STACK_OF(X509) * sk); 92int cert_load(BIO * in, STACK_OF(X509) * sk);
93static int set_pbe(BIO * err, int *ppbe, const char *str); 93static int set_pbe(BIO * err, int *ppbe, const char *str);
94 94
95int pkcs12_main(int, char **);
96
97int 95int
98pkcs12_main(int argc, char **argv) 96pkcs12_main(int argc, char **argv)
99{ 97{