diff options
Diffstat (limited to 'lib/libssl/src/apps/progs.h')
| -rw-r--r-- | lib/libssl/src/apps/progs.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/lib/libssl/src/apps/progs.h b/lib/libssl/src/apps/progs.h index df067182bc4..ffb21bd64fd 100644 --- a/lib/libssl/src/apps/progs.h +++ b/lib/libssl/src/apps/progs.h @@ -1,11 +1,14 @@ -/* This file was generated by progs.pl. */ +/* apps/progs.h */ +/* automatically generated by progs.pl for openssl.c */ extern int verify_main(int argc,char *argv[]); extern int asn1parse_main(int argc,char *argv[]); extern int req_main(int argc,char *argv[]); extern int dgst_main(int argc,char *argv[]); extern int dh_main(int argc,char *argv[]); +extern int dhparam_main(int argc,char *argv[]); extern int enc_main(int argc,char *argv[]); +extern int passwd_main(int argc,char *argv[]); extern int gendh_main(int argc,char *argv[]); extern int errstr_main(int argc,char *argv[]); extern int ca_main(int argc,char *argv[]); @@ -28,8 +31,8 @@ extern int ciphers_main(int argc,char *argv[]); extern int nseq_main(int argc,char *argv[]); extern int pkcs12_main(int argc,char *argv[]); extern int pkcs8_main(int argc,char *argv[]); - -#ifdef SSLEAY_SRC /* Defined only in openssl.c. */ +extern int spkac_main(int argc,char *argv[]); +extern int smime_main(int argc,char *argv[]); #define FUNC_TYPE_GENERAL 1 #define FUNC_TYPE_MD 2 @@ -49,7 +52,11 @@ FUNCTION functions[] = { #ifndef NO_DH {FUNC_TYPE_GENERAL,"dh",dh_main}, #endif +#ifndef NO_DH + {FUNC_TYPE_GENERAL,"dhparam",dhparam_main}, +#endif {FUNC_TYPE_GENERAL,"enc",enc_main}, + {FUNC_TYPE_GENERAL,"passwd",passwd_main}, #ifndef NO_DH {FUNC_TYPE_GENERAL,"gendh",gendh_main}, #endif @@ -72,14 +79,14 @@ FUNCTION functions[] = { #ifndef NO_DSA {FUNC_TYPE_GENERAL,"gendsa",gendsa_main}, #endif -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3)) +#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) {FUNC_TYPE_GENERAL,"s_server",s_server_main}, #endif -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3)) +#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) {FUNC_TYPE_GENERAL,"s_client",s_client_main}, #endif {FUNC_TYPE_GENERAL,"speed",speed_main}, -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3)) +#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) {FUNC_TYPE_GENERAL,"s_time",s_time_main}, #endif {FUNC_TYPE_GENERAL,"version",version_main}, @@ -94,6 +101,8 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main}, #endif {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, + {FUNC_TYPE_GENERAL,"spkac",spkac_main}, + {FUNC_TYPE_GENERAL,"smime",smime_main}, {FUNC_TYPE_MD,"md2",dgst_main}, {FUNC_TYPE_MD,"md5",dgst_main}, {FUNC_TYPE_MD,"sha",dgst_main}, @@ -116,6 +125,9 @@ FUNCTION functions[] = { #ifndef NO_RC4 {FUNC_TYPE_CIPHER,"rc4",enc_main}, #endif +#ifndef NO_RC4 + {FUNC_TYPE_CIPHER,"rc4-40",enc_main}, +#endif #ifndef NO_RC2 {FUNC_TYPE_CIPHER,"rc2",enc_main}, #endif @@ -188,6 +200,12 @@ FUNCTION functions[] = { #ifndef NO_RC2 {FUNC_TYPE_CIPHER,"rc2-ofb",enc_main}, #endif +#ifndef NO_RC2 + {FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main}, +#endif +#ifndef NO_RC2 + {FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main}, +#endif #ifndef NO_BF {FUNC_TYPE_CIPHER,"bf-cbc",enc_main}, #endif @@ -229,5 +247,3 @@ FUNCTION functions[] = { #endif {0,NULL,NULL} }; -#endif - |