aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-11-16 14:05:14 +0000
committerMatt Caswell <matt@openssl.org>2019-01-04 13:19:39 +0000
commit41999e7d358c3657a254b34b85fd9e948180529b (patch)
tree42267ffc53b96b3b1097a29d8678974267e2ffb7 /Configurations
parent88d57bf83fe32b2c8ceb1264562fdd028de504bf (diff)
downloadopenssl-41999e7d358c3657a254b34b85fd9e948180529b.zip
openssl-41999e7d358c3657a254b34b85fd9e948180529b.tar.gz
openssl-41999e7d358c3657a254b34b85fd9e948180529b.tar.bz2
Introduce a no-pinshared option
This option prevents OpenSSL from pinning itself in memory. Fixes #7598 [extended tests] Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7647)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 6506203..21d8345 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -651,7 +651,7 @@ my %targets = (
dso_scheme => "dlfcn",
shared_target => "linux-shared",
shared_cflag => "-fPIC",
- shared_ldflag => "-Wl,-znodelete",
+ shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
enable => [ "afalgeng" ],
},