From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 30 Jun 2009 15:08:38 +0000 (+0000)
Subject: PR: 1966
X-Git-Tag: OpenSSL_1_0_0-beta3~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e07229564fb50843408c9e2aa475c19dcd6ba81;p=oweals%2Fopenssl.git

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 d323a1caab..79e479a337 100644
--- 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 af5776054f..de6fdeabbd 100644
--- 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; }
 	}