OpenSSL 0.9.4 merge

1 files changed, 22 insertions, 40 deletions

diff --git a/src/lib/libssl/src/apps/progs.h b/src/lib/libssl/src/apps/progs.h
index ec00396ed7..df067182bc 100644
--- a/src/lib/libssl/src/apps/progs.h
+++ b/src/lib/libssl/src/apps/progs.h
@@ -1,4 +1,5 @@
-#ifndef NOPROTO
+/* This file was generated by progs.pl. */
+
 extern int verify_main(int argc,char *argv[]);
 extern int asn1parse_main(int argc,char *argv[]);
 extern int req_main(int argc,char *argv[]);
@@ -14,6 +15,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[]);
@@ -23,34 +25,11 @@ extern int pkcs7_main(int argc,char *argv[]);
 extern int crl2pkcs7_main(int argc,char *argv[]);
 extern int sess_id_main(int argc,char *argv[]);
 extern int ciphers_main(int argc,char *argv[]);
-#else
-extern int verify_main();
-extern int asn1parse_main();
-extern int req_main();
-extern int dgst_main();
-extern int dh_main();
-extern int enc_main();
-extern int gendh_main();
-extern int errstr_main();
-extern int ca_main();
-extern int crl_main();
-extern int rsa_main();
-extern int dsa_main();
-extern int dsaparam_main();
-extern int x509_main();
-extern int genrsa_main();
-extern int s_server_main();
-extern int s_client_main();
-extern int speed_main();
-extern int s_time_main();
-extern int version_main();
-extern int pkcs7_main();
-extern int crl2pkcs7_main();
-extern int sess_id_main();
-extern int ciphers_main();
-#endif
+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
+#ifdef SSLEAY_SRC  /* Defined only in openssl.c. */
 
 #define FUNC_TYPE_GENERAL       1
 #define FUNC_TYPE_MD            2
@@ -65,9 +44,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,9 +54,7 @@ FUNCTION functions[] = {
         {FUNC_TYPE_GENERAL,"gendh",gendh_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},
@@ -90,12 +65,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
@@ -110,14 +86,20 @@ FUNCTION functions[] = {
         {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(O_SSL3))
+#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
         {FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
+        {FUNC_TYPE_GENERAL,"nseq",nseq_main},
+#if !defined(NO_DES) && !defined(NO_SHA1)
+        {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
+#endif
+        {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
         {FUNC_TYPE_MD,"md2",dgst_main},
         {FUNC_TYPE_MD,"md5",dgst_main},
         {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},
@@ -137,7 +119,7 @@ FUNCTION functions[] = {
 #ifndef NO_RC2
         {FUNC_TYPE_CIPHER,"rc2",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
         {FUNC_TYPE_CIPHER,"bf",enc_main},
 #endif
 #ifndef NO_CAST
@@ -206,16 +188,16 @@ FUNCTION functions[] = {
 #ifndef NO_RC2
         {FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
         {FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
         {FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
         {FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
 #endif
-#ifndef NO_BLOWFISH
+#ifndef NO_BF
         {FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
 #endif
 #ifndef NO_CAST