summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/progs.h
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/progs.h
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/progs.h')
-rw-r--r--src/usr.bin/openssl/progs.h108
1 files changed, 47 insertions, 61 deletions
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
index 1f2cfb0ba4..c1b0c62752 100644
--- a/src/usr.bin/openssl/progs.h
+++ b/src/usr.bin/openssl/progs.h
@@ -1,63 +1,49 @@
1/* $OpenBSD: progs.h,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */ 1/* $OpenBSD: progs.h,v 1.6 2015/08/22 16:36:05 jsing Exp $ */
2/* Public domain */ 2/* Public domain */
3 3
4extern int asn1parse_main(int argc, char *argv[]); 4int asn1parse_main(int argc, char **argv);
5extern int ca_main(int argc, char *argv[]); 5int ca_main(int argc, char **argv);
6extern int certhash_main(int argc, char *argv[]); 6int certhash_main(int argc, char **argv);
7extern int ciphers_main(int argc, char *argv[]); 7int ciphers_main(int argc, char **argv);
8extern int cms_main(int argc, char *argv[]); 8int cms_main(int argc, char **argv);
9extern int crl2pkcs7_main(int argc, char *argv[]); 9int crl2pkcs7_main(int argc, char **argv);
10extern int crl_main(int argc, char *argv[]); 10int crl_main(int argc, char **argv);
11extern int dgst_main(int argc, char *argv[]); 11int dgst_main(int argc, char **argv);
12extern int dh_main(int argc, char *argv[]); 12int dh_main(int argc, char **argv);
13extern int dhparam_main(int argc, char *argv[]); 13int dhparam_main(int argc, char **argv);
14extern int dsa_main(int argc, char *argv[]); 14int dsa_main(int argc, char **argv);
15extern int dsaparam_main(int argc, char *argv[]); 15int dsaparam_main(int argc, char **argv);
16extern int ec_main(int argc, char *argv[]); 16int ec_main(int argc, char **argv);
17extern int ecparam_main(int argc, char *argv[]); 17int ecparam_main(int argc, char **argv);
18extern int enc_main(int argc, char *argv[]); 18int enc_main(int argc, char **argv);
19extern int engine_main(int argc, char *argv[]); 19int engine_main(int argc, char **argv);
20extern int errstr_main(int argc, char *argv[]); 20int errstr_main(int argc, char **argv);
21extern int gendh_main(int argc, char *argv[]); 21int gendh_main(int argc, char **argv);
22extern int gendsa_main(int argc, char *argv[]); 22int gendsa_main(int argc, char **argv);
23extern int genpkey_main(int argc, char *argv[]); 23int genpkey_main(int argc, char **argv);
24extern int genrsa_main(int argc, char *argv[]); 24int genrsa_main(int argc, char **argv);
25extern int nseq_main(int argc, char *argv[]); 25int nseq_main(int argc, char **argv);
26extern int ocsp_main(int argc, char *argv[]); 26int ocsp_main(int argc, char **argv);
27extern int passwd_main(int argc, char *argv[]); 27int passwd_main(int argc, char **argv);
28extern int pkcs7_main(int argc, char *argv[]); 28int pkcs7_main(int argc, char **argv);
29extern int pkcs8_main(int argc, char *argv[]); 29int pkcs8_main(int argc, char **argv);
30extern int pkcs12_main(int argc, char *argv[]); 30int pkcs12_main(int argc, char **argv);
31extern int pkey_main(int argc, char *argv[]); 31int pkey_main(int argc, char **argv);
32extern int pkeyparam_main(int argc, char *argv[]); 32int pkeyparam_main(int argc, char **argv);
33extern int pkeyutl_main(int argc, char *argv[]); 33int pkeyutl_main(int argc, char **argv);
34extern int prime_main(int argc, char *argv[]); 34int prime_main(int argc, char **argv);
35extern int rand_main(int argc, char *argv[]); 35int rand_main(int argc, char **argv);
36extern int req_main(int argc, char *argv[]); 36int req_main(int argc, char **argv);
37extern int rsa_main(int argc, char *argv[]); 37int rsa_main(int argc, char **argv);
38extern int rsautl_main(int argc, char *argv[]); 38int rsautl_main(int argc, char **argv);
39extern int s_client_main(int argc, char *argv[]); 39int s_client_main(int argc, char **argv);
40extern int s_server_main(int argc, char *argv[]); 40int s_server_main(int argc, char **argv);
41extern int s_time_main(int argc, char *argv[]); 41int s_time_main(int argc, char **argv);
42extern int sess_id_main(int argc, char *argv[]); 42int sess_id_main(int argc, char **argv);
43extern int smime_main(int argc, char *argv[]); 43int smime_main(int argc, char **argv);
44extern int speed_main(int argc, char *argv[]); 44int speed_main(int argc, char **argv);
45extern int spkac_main(int argc, char *argv[]); 45int spkac_main(int argc, char **argv);
46extern int ts_main(int argc, char *argv[]); 46int ts_main(int argc, char **argv);
47extern int verify_main(int argc, char *argv[]); 47int verify_main(int argc, char **argv);
48extern int version_main(int argc, char *argv[]); 48int version_main(int argc, char **argv);
49extern int x509_main(int argc, char *argv[]); 49int x509_main(int argc, char **argv);
50
51#define FUNC_TYPE_GENERAL 1
52#define FUNC_TYPE_MD 2
53#define FUNC_TYPE_CIPHER 3
54#define FUNC_TYPE_PKEY 4
55#define FUNC_TYPE_MD_ALG 5
56#define FUNC_TYPE_CIPHER_ALG 6
57
58typedef struct {
59 int type;
60 const char *name;
61 int (*func)(int argc, char *argv[]);
62} FUNCTION;
63DECLARE_LHASH_OF(FUNCTION);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 00:24:08 +0000