PR: 1966

Submitted by: David McCullough <david_mccullough@securecomputing.com>
Reviewed by: steve@openssl.org

Make no-ocsp work properly.

diff --git a/apps/progs.h b/apps/progs.h
index d323a1caaba0511fbf6a5948f40416e63b040c9f..79e479a33768dfde2a5fbc98c132cd28ef5a86c6 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -142,7 +142,9 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_ENGINE
        {FUNC_TYPE_GENERAL,"engine",engine_main},
 #endif
+#ifndef OPENSSL_NO_OCSP
        {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
+#endif
        {FUNC_TYPE_GENERAL,"prime",prime_main},
        {FUNC_TYPE_GENERAL,"ts",ts_main},
 #ifndef OPENSSL_NO_MD2

diff --git a/apps/progs.pl b/apps/progs.pl
index af5776054fd58169cdbc205fc675f933d85edef0..de6fdeabbd63a495773af80d41de3b9c4217528e 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -22,6 +22,7 @@ typedef struct {
        const char *name;
        int (*func)(int argc,char *argv[]);
        } FUNCTION;
+DECLARE_LHASH_OF(FUNCTION);
 
 FUNCTION functions[] = {
 EOF
@@ -48,6 +49,8 @@ foreach (@ARGV)
                { print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
        elsif ( ($_ =~ /^cms$/))
                { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^ocsp$/))
+               { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
        else
                { print $str; }
        }