avoid some NO_<cipher> problems

[openssl.git] / apps / progs.h

diff --git a/apps/progs.h b/apps/progs.h
index a37d7e42ffd7ad6c7a5878a3a7a4e99d5d3569c9..df067182bc4622acf3981fdca36657e61d8e9177 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -27,6 +27,7 @@ extern int sess_id_main(int argc,char *argv[]);
 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. */
 
@@ -85,11 +86,14 @@ 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},