[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Mar 9 12:38:57 UTC 2016
The branch master has been updated
via 9749a07a1d9488c2250e5461acec9b8da40762b0 (commit)
via 9ee3a5bb249434167e7ef02a68d3a94944ce66bf (commit)
via 707059a9ad1680bf7761fd90956c719d579ce117 (commit)
via 79fff39d71708c5dffa205045767d7bc522da789 (commit)
from 63ee7129f1e034b4befd4706dc9ab471fc525e73 (commit)
- Log -----------------------------------------------------------------
commit 9749a07a1d9488c2250e5461acec9b8da40762b0
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Mar 9 12:52:50 2016 +0100
Don't call ENGINE_cleanup when configured "no-engine"
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 9ee3a5bb249434167e7ef02a68d3a94944ce66bf
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Mar 9 09:05:43 2016 +0100
Don't add engines if configured "no-engine"
Similarly, don't add e_capi if configured "no-capieng"
Also, indent a little deeper, for clarity.
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 707059a9ad1680bf7761fd90956c719d579ce117
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Mar 9 09:05:03 2016 +0100
Don't add afalg engine if configured "no-engine"
Also, indent a little deeper, for clarity.
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 79fff39d71708c5dffa205045767d7bc522da789
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Mar 9 09:04:01 2016 +0100
Don't check the conditions to build e_afalg if configured "no-engine"
Reviewed-by: Matt Caswell <matt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 30 ++++++++++++++-------------
crypto/init.c | 4 ++++
engines/afalg/build.info | 22 +++++++++++---------
engines/build.info | 53 +++++++++++++++++++++++++++---------------------
4 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/Configure b/Configure
index cbd9395..9a2ac4e 100755
--- a/Configure
+++ b/Configure
@@ -1193,22 +1193,24 @@ else { $no_user_defines=1; }
# ALL MODIFICATIONS TO %config and %target MUST BE DONE FROM HERE ON
-$config{afalg}="";
-if ($target =~ m/^linux/) {
- my $minver = 4*10000 + 1*100 + 0;
- if ($config{cross_compile_prefix} eq "") {
- my $verstr = `uname -r`;
- my ($ma, $mi1, $mi2) = split("\\.", $verstr);
- ($mi2) = $mi2 =~ /(\d+)/;
- my $ver = $ma*10000 + $mi1*100 + $mi2;
- if ($ver < $minver) {
- $disabled{afalg} = "too-old-kernel";
- } else {
- push @{$config{engdirs}}, "afalg";
+unless ($disabled{engine}) {
+ $config{afalg}="";
+ if ($target =~ m/^linux/) {
+ my $minver = 4*10000 + 1*100 + 0;
+ if ($config{cross_compile_prefix} eq "") {
+ my $verstr = `uname -r`;
+ my ($ma, $mi1, $mi2) = split("\\.", $verstr);
+ ($mi2) = $mi2 =~ /(\d+)/;
+ my $ver = $ma*10000 + $mi1*100 + $mi2;
+ if ($ver < $minver) {
+ $disabled{afalg} = "too-old-kernel";
+ } else {
+ push @{$config{engdirs}}, "afalg";
+ }
}
+ } else {
+ $disabled{afalg} = "not-linux";
}
-} else {
- $disabled{afalg} = "not-linux";
}
push @{$config{openssl_other_defines}}, "OPENSSL_NO_AFALGENG" if ($disabled{afalg});
diff --git a/crypto/init.c b/crypto/init.c
index c19afd0..1cac741 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -455,8 +455,10 @@ void OPENSSL_cleanup(void)
CRYPTO_THREAD_cleanup_local(&threadstopkey);
#ifdef OPENSSL_INIT_DEBUG
+#ifndef OPENSSL_NO_ENGINE
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"ENGINE_cleanup()\n");
+#endif
fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
"CRYPTO_cleanup_all_ex_data()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
@@ -467,7 +469,9 @@ void OPENSSL_cleanup(void)
"RAND_cleanup()\n");
#endif
+#ifndef OPENSSL_NO_ENGINE
ENGINE_cleanup();
+#endif
CRYPTO_cleanup_all_ex_data();
EVP_cleanup();
CONF_modules_free();
diff --git a/engines/afalg/build.info b/engines/afalg/build.info
index ecbc9a1..5aba447 100644
--- a/engines/afalg/build.info
+++ b/engines/afalg/build.info
@@ -1,13 +1,15 @@
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}
-IF[{- !$disabled{afalg} -}]
- IF[{- $disabled{"dynamic-engine"} -}]
- LIBS=../../libcrypto
- SOURCE[../../libcrypto]=e_afalg.c e_afalg_err.c
- ELSE
- ENGINES=afalg
- SOURCE[afalg]=e_afalg.c e_afalg_err.c
- DEPEND[afalg]=../../libcrypto
- INCLUDE[afalg]= {- rel2abs(catdir($builddir,"../../include")) -} ../../include
- ENDIF
+IF[{- !$disabled{"engine"} -}]
+ IF[{- !$disabled{afalg} -}]
+ IF[{- $disabled{"dynamic-engine"} -}]
+ LIBS=../../libcrypto
+ SOURCE[../../libcrypto]=e_afalg.c e_afalg_err.c
+ ELSE
+ ENGINES=afalg
+ SOURCE[afalg]=e_afalg.c e_afalg_err.c
+ DEPEND[afalg]=../../libcrypto
+ INCLUDE[afalg]= {- rel2abs(catdir($builddir,"../../include")) -} ../../include
+ ENDIF
+ ENDIF
ENDIF
diff --git a/engines/build.info b/engines/build.info
index c8fba26..28fce1a 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -1,25 +1,32 @@
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}
-IF[{- $disabled{"dynamic-engine"} -}]
- LIBS=../libcrypto
- SOURCE[../libcrypto]=\
- e_padlock.c {- $target{padlock_asm_src} -} \
- e_capi.c \
- e_dasync.c
-ELSE
- ENGINES=padlock capi dasync ossltest
- SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
- DEPEND[padlock]=../libcrypto
- INCLUDE[padlock]={- rel2abs(catdir($builddir,"../include")) -} ../include
- SOURCE[capi]=e_capi.c
- DEPEND[capi]=../libcrypto
- INCLUDE[capi]={- rel2abs(catdir($builddir,"../include")) -} ../include
- SOURCE[dasync]=e_dasync.c
- DEPEND[dasync]=../libcrypto
- INCLUDE[dasync]={- rel2abs(catdir($builddir,"../include")) -} ../include
- SOURCE[ossltest]=e_ossltest.c
- DEPEND[ossltest]=../libcrypto
- INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
-ENDIF
+IF[{- !$disabled{"engine"} -}]
+ IF[{- $disabled{"dynamic-engine"} -}]
+ LIBS=../libcrypto
+ SOURCE[../libcrypto]=\
+ e_padlock.c {- $target{padlock_asm_src} -} \
+ e_dasync.c
+ IF[{- !$disabled{capieng} -}]
+ SOURCE[../libcrypto]=e_capi.c
+ ENDIF
+ ELSE
+ ENGINES=padlock dasync ossltest
+ SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
+ DEPEND[padlock]=../libcrypto
+ INCLUDE[padlock]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ IF[{- !$disabled{capieng} -}]
+ ENGINES=capi
+ SOURCE[capi]=e_capi.c
+ DEPEND[capi]=../libcrypto
+ INCLUDE[capi]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ ENDIF
+ SOURCE[dasync]=e_dasync.c
+ DEPEND[dasync]=../libcrypto
+ INCLUDE[dasync]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ SOURCE[ossltest]=e_ossltest.c
+ DEPEND[ossltest]=../libcrypto
+ INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ ENDIF
-GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
-GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
+ GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
+ GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
+ENDIF
More information about the openssl-commits
mailing list