[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  239f2771e13ddc2fa50d01d62c10078befa8c86e (commit)
      from  d8c25de595019e2948ed2a25847b695b41cdea3c (commit)


- Log -----------------------------------------------------------------
commit 239f2771e13ddc2fa50d01d62c10078befa8c86e
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Apr 25 16:03:07 2015 -0400

    Remove EFENCE support.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/ca.c  | 12 ------------
 apps/srp.c | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 38c96ae..218a407 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -144,12 +144,6 @@
 #define REV_KEY_COMPROMISE      3 /* Value is cert key compromise time */
 #define REV_CA_COMPROMISE       4 /* Value is CA key compromise time */
 
-#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,
@@ -313,12 +307,6 @@ int ca_main(int argc, char **argv)
     X509_REVOKED *r = NULL;
     OPTION_CHOICE o;
 
-#ifdef EFENCE
-    EF_PROTECT_FREE = 1;
-    EF_PROTECT_BELOW = 1;
-    EF_ALIGNMENT = 0;
-#endif
-
     conf = NULL;
     section = NULL;
     preserve = 0;
diff --git a/apps/srp.c b/apps/srp.c
index 0585952..c62d55d 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -78,12 +78,6 @@
 # define ENV_DATABASE            "srpvfile"
 # define ENV_DEFAULT_SRP         "default_srp"
 
-# ifdef EFENCE
-extern int EF_PROTECT_FREE;
-extern int EF_PROTECT_BELOW;
-extern int EF_ALIGNMENT;
-# endif
-
 static int get_index(CA_DB *db, char *id, char type)
 {
     char **pp;
@@ -277,12 +271,6 @@ int srp_main(int argc, char **argv)
     long errorline = -1;
     OPTION_CHOICE o;
 
-# ifdef EFENCE
-    EF_PROTECT_FREE = 1;
-    EF_PROTECT_BELOW = 1;
-    EF_ALIGNMENT = 0;
-# endif
-
     prog = opt_init(argc, argv, srp_options);
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {