X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=apps%2Fprogs.h;h=752385d3a735440a629c54f8db9ebc5bb464df85;hp=7d2238493a4e2d68df3b160e0beaed1c62bea1ea;hb=a3faebd1041576a59bffe01bbd2c68495870ec5e;hpb=27b782732fe4d09dbcb279640fde1b6b300ea4a0 diff --git a/apps/progs.h b/apps/progs.h index 7d2238493a..752385d3a7 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -14,6 +14,7 @@ extern int errstr_main(int argc,char *argv[]); extern int ca_main(int argc,char *argv[]); extern int crl_main(int argc,char *argv[]); extern int rsa_main(int argc,char *argv[]); +extern int rsautl_main(int argc,char *argv[]); extern int dsa_main(int argc,char *argv[]); extern int dsaparam_main(int argc,char *argv[]); extern int x509_main(int argc,char *argv[]); @@ -34,6 +35,8 @@ extern int pkcs8_main(int argc,char *argv[]); extern int spkac_main(int argc,char *argv[]); extern int smime_main(int argc,char *argv[]); extern int rand_main(int argc,char *argv[]); +extern int engine_main(int argc,char *argv[]); +extern int ocsp_main(int argc,char *argv[]); #define FUNC_TYPE_GENERAL 1 #define FUNC_TYPE_MD 2 @@ -50,201 +53,239 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main}, {FUNC_TYPE_GENERAL,"req",req_main}, {FUNC_TYPE_GENERAL,"dgst",dgst_main}, -#ifndef NO_DH +#ifndef OPENSSL_NO_DH {FUNC_TYPE_GENERAL,"dh",dh_main}, #endif -#ifndef NO_DH +#ifndef OPENSSL_NO_DH {FUNC_TYPE_GENERAL,"dhparam",dhparam_main}, #endif {FUNC_TYPE_GENERAL,"enc",enc_main}, {FUNC_TYPE_GENERAL,"passwd",passwd_main}, -#ifndef NO_DH +#ifndef OPENSSL_NO_DH {FUNC_TYPE_GENERAL,"gendh",gendh_main}, #endif {FUNC_TYPE_GENERAL,"errstr",errstr_main}, {FUNC_TYPE_GENERAL,"ca",ca_main}, {FUNC_TYPE_GENERAL,"crl",crl_main}, -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA {FUNC_TYPE_GENERAL,"rsa",rsa_main}, #endif -#ifndef NO_DSA +#ifndef OPENSSL_NO_RSA + {FUNC_TYPE_GENERAL,"rsautl",rsautl_main}, +#endif +#ifndef OPENSSL_NO_DSA {FUNC_TYPE_GENERAL,"dsa",dsa_main}, #endif -#ifndef NO_DSA +#ifndef OPENSSL_NO_DSA {FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main}, #endif {FUNC_TYPE_GENERAL,"x509",x509_main}, -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA {FUNC_TYPE_GENERAL,"genrsa",genrsa_main}, #endif -#ifndef NO_DSA +#ifndef OPENSSL_NO_DSA {FUNC_TYPE_GENERAL,"gendsa",gendsa_main}, #endif -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) +#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) {FUNC_TYPE_GENERAL,"s_server",s_server_main}, #endif -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) +#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_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(NO_SSL3)) +#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) {FUNC_TYPE_GENERAL,"s_time",s_time_main}, #endif {FUNC_TYPE_GENERAL,"version",version_main}, {FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main}, {FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main}, {FUNC_TYPE_GENERAL,"sess_id",sess_id_main}, -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) +#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) {FUNC_TYPE_GENERAL,"ciphers",ciphers_main}, #endif {FUNC_TYPE_GENERAL,"nseq",nseq_main}, -#if !defined(NO_DES) && !defined(NO_SHA1) +#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1) {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_GENERAL,"rand",rand_main}, + {FUNC_TYPE_GENERAL,"engine",engine_main}, + {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, +#ifndef OPENSSL_NO_MD2 {FUNC_TYPE_MD,"md2",dgst_main}, +#endif +#ifndef OPENSSL_NO_MD4 + {FUNC_TYPE_MD,"md4",dgst_main}, +#endif +#ifndef OPENSSL_NO_MD5 {FUNC_TYPE_MD,"md5",dgst_main}, +#endif +#ifndef OPENSSL_NO_SHA {FUNC_TYPE_MD,"sha",dgst_main}, +#endif +#ifndef OPENSSL_NO_SHA1 {FUNC_TYPE_MD,"sha1",dgst_main}, +#endif +#ifndef OPENSSL_NO_MDC2 {FUNC_TYPE_MD,"mdc2",dgst_main}, +#endif +#ifndef OPENSSL_NO_RMD160 {FUNC_TYPE_MD,"rmd160",dgst_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_AES + {FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main}, +#endif {FUNC_TYPE_CIPHER,"base64",enc_main}, -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des3",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"desx",enc_main}, #endif -#ifndef NO_IDEA +#ifndef OPENSSL_NO_IDEA {FUNC_TYPE_CIPHER,"idea",enc_main}, #endif -#ifndef NO_RC4 +#ifndef OPENSSL_NO_RC4 {FUNC_TYPE_CIPHER,"rc4",enc_main}, #endif -#ifndef NO_RC4 +#ifndef OPENSSL_NO_RC4 {FUNC_TYPE_CIPHER,"rc4-40",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2",enc_main}, #endif -#ifndef NO_BF +#ifndef OPENSSL_NO_BF {FUNC_TYPE_CIPHER,"bf",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast",enc_main}, #endif -#ifndef NO_RC5 +#ifndef OPENSSL_NO_RC5 {FUNC_TYPE_CIPHER,"rc5",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ecb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede3",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-cbc",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede-cbc",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede3-cbc",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-cfb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede-cfb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede3-cfb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ofb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede-ofb",enc_main}, #endif -#ifndef NO_DES +#ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des-ede3-ofb",enc_main}, #endif -#ifndef NO_IDEA +#ifndef OPENSSL_NO_IDEA {FUNC_TYPE_CIPHER,"idea-cbc",enc_main}, #endif -#ifndef NO_IDEA +#ifndef OPENSSL_NO_IDEA {FUNC_TYPE_CIPHER,"idea-ecb",enc_main}, #endif -#ifndef NO_IDEA +#ifndef OPENSSL_NO_IDEA {FUNC_TYPE_CIPHER,"idea-cfb",enc_main}, #endif -#ifndef NO_IDEA +#ifndef OPENSSL_NO_IDEA {FUNC_TYPE_CIPHER,"idea-ofb",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-cbc",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-ecb",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-cfb",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-ofb",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main}, #endif -#ifndef NO_RC2 +#ifndef OPENSSL_NO_RC2 {FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main}, #endif -#ifndef NO_BF +#ifndef OPENSSL_NO_BF {FUNC_TYPE_CIPHER,"bf-cbc",enc_main}, #endif -#ifndef NO_BF +#ifndef OPENSSL_NO_BF {FUNC_TYPE_CIPHER,"bf-ecb",enc_main}, #endif -#ifndef NO_BF +#ifndef OPENSSL_NO_BF {FUNC_TYPE_CIPHER,"bf-cfb",enc_main}, #endif -#ifndef NO_BF +#ifndef OPENSSL_NO_BF {FUNC_TYPE_CIPHER,"bf-ofb",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast5-cbc",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast5-ecb",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast5-cfb",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast5-ofb",enc_main}, #endif -#ifndef NO_CAST +#ifndef OPENSSL_NO_CAST {FUNC_TYPE_CIPHER,"cast-cbc",enc_main}, #endif -#ifndef NO_RC5 +#ifndef OPENSSL_NO_RC5 {FUNC_TYPE_CIPHER,"rc5-cbc",enc_main}, #endif -#ifndef NO_RC5 +#ifndef OPENSSL_NO_RC5 {FUNC_TYPE_CIPHER,"rc5-ecb",enc_main}, #endif -#ifndef NO_RC5 +#ifndef OPENSSL_NO_RC5 {FUNC_TYPE_CIPHER,"rc5-cfb",enc_main}, #endif -#ifndef NO_RC5 +#ifndef OPENSSL_NO_RC5 {FUNC_TYPE_CIPHER,"rc5-ofb",enc_main}, #endif {0,NULL,NULL}