Commit c2e27310 authored by Viktor Dukhovni's avatar Viktor Dukhovni Committed by Dr. Stephen Henson
Browse files

Enable/disable crypto-mdebug just like other features 



Also always abort() on leak failure.

Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent 3af45d99

Configurations/10-main.conf

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    "vos-gcc" => {

        cc               => "gcc",

        cflags           => "-Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG",

        release_cflags   => "-O3",

        thread_cflag     => "(unknown)",

        sys_id           => "VOS",
@@ -132,7 +132,7 @@ 
        # -mcpu=ultrasparc

        inherit_from     => [ "solaris-sparcv7-gcc", asm("sparcv9_asm") ],

        cflags           => sub { join(" ","-m32 -mcpu=ultrasparc",@_); },

        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",

        debug_cflags     => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -O -g -pedantic -ansi -Wshadow -Wno-long-long -D__EXTENSIONS__",

    },

    "solaris64-sparcv9-gcc" => {

        inherit_from     => [ "solaris-sparcv9-gcc" ],
@@ -150,7 +150,7 @@ 
        inherit_from     => [ "solaris-common" ],

        cc               => "cc",

        cflags           => sub { join(" ","-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",@_) },

        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG",

        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",

        release_cflags   => "-xO5 -xdepend",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },
@@ -501,7 +501,7 @@ 
    "linux-generic32" => {

        cc               => "gcc",

        cflags           => "-Wall",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        lflags           => "-ldl",
@@ -612,7 +612,7 @@ 
        inherit_from     => [ "linux-generic32", asm("x86_elf_asm") ],

        cc               => "gcc",

        cflags           => "-march=i486 -DL_ENDIAN -Wall",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",

        release_cflags   => "-O3 -fomit-frame-pointer",

        debug_lflags     => "-lefence",

        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
@@ -1450,7 +1450,7 @@ 
    },

    "vxworks-ppc750-debug" => {

        cc               => "ccppc",

        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",

        cflags           => "-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g",

        sys_id           => "VXWORKS",

        lflags           => "-r",

    },

Configurations/90-team.conf

+5 −5
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
    },

    "debug" => {

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",

        thread_cflag     => "(unknown)",

        lflags           => "-lefence",

    },

    "debug-erbridge" => {

        inherit_from     => [ "x86_64_asm" ],

        cc               => "gcc",

        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g",

        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
@@ -36,7 +36,7 @@ 
    "debug-linux-pentium" => {

        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
@@ -45,7 +45,7 @@ 
    "debug-linux-ppro" => {

        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
@@ -54,7 +54,7 @@ 
    "debug-linux-elf-noefence" => {

        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -march=i486 -Wall",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",

Configurations/99-personal-ben.conf

+5 −5
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
%targets = (

    "debug-ben" => {

        cc               => "gcc",

        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe",

        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -O2 -pipe",

        thread_cflag     => "(unknown)",

    },

    "debug-ben-openbsd" => {

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",

        thread_cflag     => "(unknown)",

    },

    "debug-ben-openbsd-debug" => {

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",

        thread_cflag     => "(unknown)",

    },

    "debug-ben-debug" => {
@@ -69,12 +69,12 @@ 
    },

    "debug-ben-no-opt" => {

        cc               => "gcc",

        cflags           => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3",

        cflags           => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -Werror -DL_ENDIAN -Wall -g3",

        thread_cflag     => "(unknown)",

    },

    "debug-ben-strict" => {

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",

        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",

        thread_cflag     => "(unknown)",

    },

    "debug-ben-darwin64" => {

Configurations/99-personal-levitte.conf

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DL_ENDIAN -Wall",

        debug_cflags     => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3",

        debug_cflags     => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -ggdb -g3",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
@@ -22,7 +22,7 @@ 
    "debug-levitte-linux-noasm" => {

        inherit_from     => [ "no_asm_filler" ],

        cc               => "gcc",

        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",

        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
@@ -34,7 +34,7 @@ 
    "debug-levitte-linux-elf-extreme" => {

        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",

        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
@@ -47,7 +47,7 @@ 
    "debug-levitte-linux-noasm-extreme" => {

        inherit_from     => [ "no_asm_filler" ],

        cc               => "gcc",

        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",

        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",

Configure

+4 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta 
# Minimum warning options... any contributions to OpenSSL should at least get

# past these.



my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DCRYPTO_MDEBUG -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DDEBUG_UNUSED";

my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DREF_CHECK -DDEBUG_UNUSED";



# These are used in addition to $gcc_devteam_warn when the compiler is clang.

# TODO(openssl-team): fix problems and investigate if (at least) the
@@ -914,7 +914,8 @@ my %disabled = ( # "what" => "comment" [or special keyword "experimental 
		 "store"	  => "experimental",

		 "unit-test"	  => "default",

		 "zlib"           => "default",

		 "zlib-dynamic"   => "default"

		 "zlib-dynamic"   => "default",

		 "crypto-mdebug"  => "default",

	       );

my @experimental = ();