summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-05-18 16:43:18 +0000
committerjsing <>2014-05-18 16:43:18 +0000
commit524c086481ad769e816ef9cd159a9660962be4e0 (patch)
tree5ea79e879e724cb9695b276230eb8e651fcfc01a
parent127e6e6abe32f23e8328bb307933d826a0ab25be (diff)
downloadopenbsd-524c086481ad769e816ef9cd159a9660962be4e0.tar.gz
openbsd-524c086481ad769e816ef9cd159a9660962be4e0.tar.bz2
openbsd-524c086481ad769e816ef9cd159a9660962be4e0.zip
Out of all the openssl apps, just one of them has code to mess around with
electric fence externs. Nuke from orbit. ok miod@
-rw-r--r--src/lib/libssl/src/apps/ca.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 59f1969023..10b5c0b3fe 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -169,12 +169,6 @@ static const char *ca_usage[] = {
169 NULL 169 NULL
170}; 170};
171 171
172#ifdef EFENCE
173extern int EF_PROTECT_FREE;
174extern int EF_PROTECT_BELOW;
175extern int EF_ALIGNMENT;
176#endif
177
178static void lookup_fail(const char *name, const char *tag); 172static void lookup_fail(const char *name, const char *tag);
179static int certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, 173static int certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509,
180 const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts, 174 const EVP_MD * dgst, STACK_OF(OPENSSL_STRING) * sigopts,
@@ -305,12 +299,6 @@ ca_main(int argc, char **argv)
305 char *tofree = NULL; 299 char *tofree = NULL;
306 DB_ATTR db_attr; 300 DB_ATTR db_attr;
307 301
308#ifdef EFENCE
309 EF_PROTECT_FREE = 1;
310 EF_PROTECT_BELOW = 1;
311 EF_ALIGNMENT = 0;
312#endif
313
314 signal(SIGPIPE, SIG_IGN); 302 signal(SIGPIPE, SIG_IGN);
315 303
316 conf = NULL; 304 conf = NULL;