openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Add an OPENSSL_NO_AUTOERRINIT option 

This option disables automatic loading of the crypto/ssl error strings in
order to keep statically linked executable file size down

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-02-09 09:39:07 +00:00
parent 71567a6f41
commit 498abff0ae
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Configure
View File

@ -228,6 +228,7 @@ my @disablables = (
"asm", "asm",
"async", "async",
"autoalginit", "autoalginit",
"autoerrinit",
"bf", "bf",
"camellia", "camellia",
"capieng", "capieng",
@ -743,7 +744,7 @@ foreach (sort (keys %disabled))
($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/; ($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/ if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
|| /^autoalginit/) || /^autoalginit/ || /^autoerrinit/)
{ {
push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO"; push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";
print " OPENSSL_NO_$ALGO"; print " OPENSSL_NO_$ALGO";

6
crypto/init.c
View File

@ -282,7 +282,11 @@ static void ossl_init_no_load_crypto_strings(void)
static void ossl_init_load_crypto_strings(void) static void ossl_init_load_crypto_strings(void)
{ {
#ifndef OPENSSL_NO_ERR /*
* OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time
* pulling in all the error strings during static linking
*/
#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT)
# ifdef OPENSSL_INIT_DEBUG # ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_strings: " fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_strings: "
"err_load_crypto_strings_intern()\n"); "err_load_crypto_strings_intern()\n");

10
ssl/ssl_init.c
View File

@ -253,11 +253,17 @@ static OPENSSL_INIT_ONCE ssl_strings = OPENSSL_INIT_ONCE_STATIC_INIT;
static int ssl_strings_inited = 0; static int ssl_strings_inited = 0;
static void ossl_init_load_ssl_strings(void) static void ossl_init_load_ssl_strings(void)
{ {
#ifdef OPENSSL_INIT_DEBUG /*
* OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time
* pulling in all the error strings during static linking
*/
#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT)
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_load_ssl_strings: " fprintf(stderr, "OPENSSL_INIT: ossl_init_load_ssl_strings: "
"ERR_load_SSL_strings()\n"); "ERR_load_SSL_strings()\n");
#endif # endif
ERR_load_SSL_strings(); ERR_load_SSL_strings();
#endif
ssl_strings_inited = 1; ssl_strings_inited = 1;
} }

3
util/mk1mf.pl
View File

@ -144,6 +144,7 @@ and [options] can be one of
no-hw - No hw no-hw - No hw
no-async - No Async (use NULL) no-async - No Async (use NULL)
no-autoalginit - Don't auto load algorithms in libcrypto no-autoalginit - Don't auto load algorithms in libcrypto
no-autoerrinit - Don't auto load error strings for libcrypto or libssl
nasm - Use NASM for x86 asm nasm - Use NASM for x86 asm
nw-nasm - Use NASM x86 asm for NetWare nw-nasm - Use NASM x86 asm for NetWare
nw-mwasm - Use Metrowerks x86 asm for NetWare nw-mwasm - Use Metrowerks x86 asm for NetWare
@ -300,6 +301,7 @@ $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine;
$cflags.=" -DOPENSSL_NO_HW" if $no_hw; $cflags.=" -DOPENSSL_NO_HW" if $no_hw;
$cflags.=" -DOPENSSL_NO_ASYNC" if $no_async; $cflags.=" -DOPENSSL_NO_ASYNC" if $no_async;
$cflags.=" -DOPENSSL_NO_AUTOALGINIT" if $no_autoalginit; $cflags.=" -DOPENSSL_NO_AUTOALGINIT" if $no_autoalginit;
$cflags.=" -DOPENSSL_NO_AUTOERRINIT" if $no_autoerrinit;
$cflags.=" -DOPENSSL_FIPS" if $fips; $cflags.=" -DOPENSSL_FIPS" if $fips;
$cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake; $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake;
$cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m; $cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m;
@ -1417,6 +1419,7 @@ sub read_options
"no-hw" => \$no_hw, "no-hw" => \$no_hw,
"no-async" => \$no_async, "no-async" => \$no_async,
"no-autoalginit" => \$no_autoalginit, "no-autoalginit" => \$no_autoalginit,
"no-autoerrinit" => \$no_autoerrinit,
"just-ssl" => "just-ssl" =>
[\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast, [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
\$no_md2, \$no_mdc2, \$no_dsa, \$no_dh, \$no_md2, \$no_mdc2, \$no_dsa, \$no_dh,