From: jsing <jsing@openbsd.org>
Date: Sun, 18 May 2014 16:43:18 +0000 (+0000)
Subject: Out of all the openssl apps, just one of them has code to mess around with
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bff5e8b4d93c012628516d56edef32a91540ffe3;p=openbsd

Out of all the openssl apps, just one of them has code to mess around with
electric fence externs. Nuke from orbit.

ok miod@
---

diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index 59f19690237..10b5c0b3fe0 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -169,12 +169,6 @@ static const char *ca_usage[] = {
 	NULL
 };
 
-#ifdef EFENCE
-extern int EF_PROTECT_FREE;
-extern int EF_PROTECT_BELOW;
-extern int EF_ALIGNMENT;
-#endif
-
 static void lookup_fail(const char *name, const char *tag);
 static int certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
     const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
@@ -305,12 +299,6 @@ ca_main(int argc, char **argv)
 	char *tofree = NULL;
 	DB_ATTR db_attr;
 
-#ifdef EFENCE
-	EF_PROTECT_FREE = 1;
-	EF_PROTECT_BELOW = 1;
-	EF_ALIGNMENT = 0;
-#endif
-
 	signal(SIGPIPE, SIG_IGN);
 
 	conf = NULL;