Fix the gendsa program and add it to the app list. The progs.h file is

[openssl.git] / apps / progs.h

diff --git a/apps/progs.h b/apps/progs.h
index 50e2ca4a4c63f36703eac0bc9d8c496b482859a7..4f12cba66896e6b5f273ef0160a2044590c1d24c 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -6,7 +6,6 @@ extern int dgst_main(int argc,char *argv[]);
 extern int dh_main(int argc,char *argv[]);
 extern int enc_main(int argc,char *argv[]);
 extern int gendh_main(int argc,char *argv[]);
-extern int gendsa_main(int argc,char *argv[]);
 extern int errstr_main(int argc,char *argv[]);
 extern int ca_main(int argc,char *argv[]);
 extern int crl_main(int argc,char *argv[]);
@@ -15,6 +14,7 @@ extern int dsa_main(int argc,char *argv[]);
 extern int dsaparam_main(int argc,char *argv[]);
 extern int x509_main(int argc,char *argv[]);
 extern int genrsa_main(int argc,char *argv[]);
+extern int gendsa_main(int argc,char *argv[]);
 extern int s_server_main(int argc,char *argv[]);
 extern int s_client_main(int argc,char *argv[]);
 extern int speed_main(int argc,char *argv[]);
@@ -32,7 +32,6 @@ extern int dgst_main();
 extern int dh_main();
 extern int enc_main();
 extern int gendh_main();
-extern int gendsa_main();
 extern int errstr_main();
 extern int ca_main();
 extern int crl_main();
@@ -41,6 +40,7 @@ extern int dsa_main();
 extern int dsaparam_main();
 extern int x509_main();
 extern int genrsa_main();
+extern int gendsa_main();
 extern int s_server_main();
 extern int s_client_main();
 extern int speed_main();
@@ -67,9 +67,7 @@ typedef struct {
 FUNCTION functions[] = {
        {FUNC_TYPE_GENERAL,"verify",verify_main},
        {FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
-#ifndef NO_RSA
        {FUNC_TYPE_GENERAL,"req",req_main},
-#endif
        {FUNC_TYPE_GENERAL,"dgst",dgst_main},
 #ifndef NO_DH
        {FUNC_TYPE_GENERAL,"dh",dh_main},
@@ -77,14 +75,9 @@ FUNCTION functions[] = {
        {FUNC_TYPE_GENERAL,"enc",enc_main},
 #ifndef NO_DH
        {FUNC_TYPE_GENERAL,"gendh",gendh_main},
-#endif
-#ifndef NO_DSA
-       {FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
 #endif
        {FUNC_TYPE_GENERAL,"errstr",errstr_main},
-#ifndef NO_RSA
        {FUNC_TYPE_GENERAL,"ca",ca_main},
-#endif
        {FUNC_TYPE_GENERAL,"crl",crl_main},
 #ifndef NO_RSA
        {FUNC_TYPE_GENERAL,"rsa",rsa_main},
@@ -95,12 +88,13 @@ FUNCTION functions[] = {
 #ifndef NO_DSA
        {FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
 #endif
-#ifndef NO_RSA
        {FUNC_TYPE_GENERAL,"x509",x509_main},
-#endif
 #ifndef NO_RSA
        {FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
 #endif
+#ifndef NO_DSA
+       {FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
+#endif
 #if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3))
        {FUNC_TYPE_GENERAL,"s_server",s_server_main},
 #endif
@@ -123,6 +117,7 @@ FUNCTION functions[] = {
        {FUNC_TYPE_MD,"sha",dgst_main},
        {FUNC_TYPE_MD,"sha1",dgst_main},
        {FUNC_TYPE_MD,"mdc2",dgst_main},
+       {FUNC_TYPE_MD,"rmd160",dgst_main},
        {FUNC_TYPE_CIPHER,"base64",enc_main},
 #ifndef NO_DES
        {FUNC_TYPE_CIPHER,"des",enc_main},
@@ -145,6 +140,12 @@ FUNCTION functions[] = {
 #ifndef NO_BLOWFISH
        {FUNC_TYPE_CIPHER,"bf",enc_main},
 #endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast",enc_main},
+#endif
+#ifndef NO_RC5
+       {FUNC_TYPE_CIPHER,"rc5",enc_main},
+#endif
 #ifndef NO_DES
        {FUNC_TYPE_CIPHER,"des-ecb",enc_main},
 #endif
@@ -216,6 +217,33 @@ FUNCTION functions[] = {
 #endif
 #ifndef NO_BLOWFISH
        {FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
+#endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast5-cbc",enc_main},
+#endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast5-ecb",enc_main},
+#endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast5-cfb",enc_main},
+#endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast5-ofb",enc_main},
+#endif
+#ifndef NO_CAST
+       {FUNC_TYPE_CIPHER,"cast-cbc",enc_main},
+#endif
+#ifndef NO_RC5
+       {FUNC_TYPE_CIPHER,"rc5-cbc",enc_main},
+#endif
+#ifndef NO_RC5
+       {FUNC_TYPE_CIPHER,"rc5-ecb",enc_main},
+#endif
+#ifndef NO_RC5
+       {FUNC_TYPE_CIPHER,"rc5-cfb",enc_main},
+#endif
+#ifndef NO_RC5
+       {FUNC_TYPE_CIPHER,"rc5-ofb",enc_main},
 #endif
        {0,NULL,NULL}
        };