Commit 3e9e810f authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove outdated legacy crypto options 



Many options for supporting optimizations for legacy crypto on legacy
platforms have been removed.  This simplifies the source code and
does not really penalize anyone.
        DES_PTR (always on)
        DES_RISC1, DES_RISC2 (always off)
        DES_INT (always 'unsigned int')
        DES_UNROLL (always on)
        BF_PTR (always on) BF_PTR2 (removed)
        MD2_CHAR, MD2_LONG (always 'unsigned char')
        IDEA_SHORT, IDEA_LONG (always 'unsigned int')
        RC2_SHORT, RC2_LONG (always 'unsigned int')
        RC4_LONG (only int and char (for assembler) are supported)
        RC4_CHUNK (always long), RC_CHUNK_LL (removed)
        RC4_INDEX (always on)
And also make D_ENCRYPT macro more clear (@appro)

This is done in consultation with Andy.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 8ed40b83

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ 


 Changes between 1.0.2e and 1.1.0  [xx XXX xxxx]



  *) Removed many obsolete configuration items, including

        DES_PTR, DES_RISC1, DES_RISC2, DES_INT

        MD2_CHAR, MD2_INT, MD2_LONG

        BF_PTR, BF_PTR2

        IDEA_SHORT, IDEA_LONG

        RC2_SHORT, RC2_LONG, RC4_LONG, RC4_CHUNK, RC4_INDEX

     [Rich Salz, with advice from Andy Polyakov]



  *) Configuration and writing out the results from it has changed.

     Files such as Makefile include/openssl/opensslconf.h and are now

     produced through general templates, such as Makefile.in and

Configurations/10-main.conf

+54 −62
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        shared_cflag     => "-fPIC",

        shared_ldflag    => "-m64 -shared -static-libgcc",
@@ -92,7 +92,7 @@ 
        release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_cflag     => "-KPIC",

        shared_ldflag    => "-G -dy -z text",

    },
@@ -104,7 +104,7 @@ 
        release_cflags   => "-xO5 -xdepend -xbuiltin",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        shared_cflag     => "-KPIC",

        shared_ldflag    => "-xarch=generic64 -G -dy -z text",
@@ -119,7 +119,7 @@ 
        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_cflag     => "-fPIC",

        shared_ldflag    => "-shared",

    },
@@ -137,7 +137,7 @@ 
    "solaris64-sparcv9-gcc" => {

        inherit_from     => [ "solaris-sparcv9-gcc" ],

        cflags           => sub { my $f=join(" ",@_); $f =~ s/\-m32/-m64/; $f; },

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_ldflag    => "-m64 -shared",

        multilib         => "/64",

    },
@@ -154,7 +154,7 @@ 
        release_cflags   => "-xO5 -xdepend",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_cflag     => "-KPIC",

        shared_ldflag    => "-G -dy -z text",

    },
@@ -170,7 +170,7 @@ 
    "solaris64-sparcv9-cc" => {

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

        cflags           => add_before(" ", "-xarch=v9 -xtarget=ultra"),

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_ldflag    => "-xarch=v9 -G -dy -z text",

        multilib         => "/64",

    },
@@ -184,7 +184,7 @@ 
        debug_cflags     => "-g -O0",

        release_cflags   => "-O3",

        thread_cflag     => "(unknown)",

        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        perlasm_scheme   => "o32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -197,7 +197,7 @@ 
        debug_cflags     => "-g -O0",

        release_cflags   => "-O2",

        thread_cflag     => "(unknown)",

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        perlasm_scheme   => "o32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -213,7 +213,7 @@ 
        debug_cflags     => "-g -O0",

        release_cflags   => "-O3",

        thread_cflag     => "-D_SGI_MP_SOURCE -pthread",

        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT",

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",

        perlasm_scheme   => "n32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -229,7 +229,7 @@ 
        release_cflags   => "-O2",

        thread_cflag     => "-D_SGI_MP_SOURCE",

        lflags           => "-lpthread",

        bn_ops           => "DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT",

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",

        perlasm_scheme   => "n32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -245,7 +245,7 @@ 
        debug_cflags     => "-g -O0",

        release_cflags   => "-O3",

        thread_cflag     => "-D_SGI_MP_SOURCE",

        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "64",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -261,7 +261,7 @@ 
        release_cflags   => "-O2",

        thread_cflag     => "-D_SGI_MP_SOURCE",

        lflags           => "-lpthread",

        bn_ops           => "RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG",

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "64",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",
@@ -305,7 +305,7 @@ 
        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        lflags           => "-Wl,+s -ldld",

        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",

        bn_ops           => "BN_LLONG",

        dso_scheme       => "dl",

        shared_target    => "hpux-shared",

        shared_cflag     => "-fPIC",
@@ -324,7 +324,7 @@ 
        release_cflags   => "-O3",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl",

        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "-fpic",
@@ -344,7 +344,7 @@ 
        release_cflags   => "+O3",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-Wl,+s -ldld -lpthread",

        bn_ops           => "MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "RC4_CHAR",

        dso_scheme       => "dl",

        shared_target    => "hpux-shared",

        shared_cflag     => "+Z",
@@ -364,7 +364,7 @@ 
        release_cflags   => "+O3",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl -lpthread",

        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "+Z",
@@ -382,7 +382,7 @@ 
        release_cflags   => "+O2",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl -lpthread",

        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "+Z",
@@ -400,7 +400,7 @@ 
        release_cflags   => "+O3",

        thread_cflag     => "-D_REENTRANT",

        lflags           => "-ldl -lpthread",

        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "+Z",
@@ -417,7 +417,7 @@ 
        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        lflags           => "-ldl",

        bn_ops           => "SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "-fpic",
@@ -433,7 +433,7 @@ 
        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        lflags           => "-ldl",

        bn_ops           => "SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        dso_scheme       => "dlfcn",

        shared_target    => "hpux-shared",

        shared_cflag     => "-fpic",
@@ -449,24 +449,16 @@ 
        thread_cflag     => "(unknown)",

        sys_id           => "MPE",

        lflags           => "-L/SYSLOG/PUB -lsyslog -lsocket -lcurses",

        bn_ops           => "BN_LLONG DES_PTR DES_UNROLL DES_RISC1",

        bn_ops           => "BN_LLONG",

    },



#### DEC Alpha OSF/1/Tru64 targets.

#

#	"What's in a name? That which we call a rose

#	 By any other word would smell as sweet."

#

# - William Shakespeare, "Romeo & Juliet", Act II, scene II.

#

# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version

#

    "osf1-alpha-gcc" => {

        inherit_from     => [ asm("alpha_asm") ],

        cc               => "gcc",

        cflags           => "-O3",

        thread_cflag     => "(unknown)",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        dso_scheme       => "dlfcn",

        shared_target    => "alpha-osf1-shared",

        shared_extension => ".so",
@@ -476,7 +468,7 @@ 
        cc               => "cc",

        cflags           => "-std1 -tune host -O4 -readonly_strings",

        thread_cflag     => "(unknown)",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        dso_scheme       => "dlfcn",

        shared_target    => "alpha-osf1-shared",

        shared_extension => ".so",
@@ -486,7 +478,7 @@ 
        cc               => "cc",

        cflags           => "-std1 -tune host -fast -readonly_strings",

        thread_cflag     => "-pthread",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        dso_scheme       => "dlfcn",

        shared_target    => "alpha-osf1-shared",

        shared_ldflag    => "-msym",
@@ -505,7 +497,7 @@ 
        release_cflags   => "-O3",

        thread_cflag     => "-pthread",

        lflags           => "-ldl",

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        dso_scheme       => "dlfcn",

        shared_target    => "linux-shared",

        shared_cflag     => "-fPIC",
@@ -513,7 +505,7 @@ 
    },

    "linux-generic64" => {

        inherit_from     => [ "linux-generic32" ],

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

    },



    "linux-ppc" => {
@@ -576,7 +568,7 @@ 
    "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32

        inherit_from     => [ "linux-generic32", asm("aarch64_asm") ],

        cflags           => "-mabi=ilp32 -Wall",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",

        perlasm_scheme   => "linux64",

        shared_ldflag    => "-mabi=ilp32",

    },
@@ -594,7 +586,7 @@ 
    "linux-mips64" => {

        inherit_from     => [ "linux-generic32", asm("mips64_asm") ],

        cflags           => "-mabi=n32 -Wall -DBN_DIV3W",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",

        perlasm_scheme   => "n32",

        shared_ldflag    => "-mabi=n32",

        multilib         => "32",
@@ -631,7 +623,7 @@ 
    "linux-x86_64" => {

        inherit_from     => [ "linux-generic64", asm("x86_64_asm") ],

        cflags           => "-m64 -DL_ENDIAN -Wall",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        shared_ldflag    => "-m64",

        multilib         => "64",
@@ -644,7 +636,7 @@ 
    "linux-x32" => {

        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],

        cflags           => "-mx32 -DL_ENDIAN -Wall",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT",

        perlasm_scheme   => "elf",

        shared_ldflag    => "-mx32",

        multilib         => "x32",
@@ -652,7 +644,7 @@ 


    "linux-ia64" => {

        inherit_from     => [ "linux-generic64", asm("ia64_asm") ],

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

    },



    "linux64-s390x" => {
@@ -705,7 +697,7 @@ 
        # GCC 3.1 is a requirement

        inherit_from     => [ "linux-generic64", asm("sparcv9_asm") ],

        cflags           => "-m64 -mcpu=ultrasparc -Wall -DB_ENDIAN",

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_ldflag    => "-m64",

        multilib         => "64",

    },
@@ -713,7 +705,7 @@ 
    "linux-alpha-gcc" => {

        inherit_from     => [ "linux-generic64", asm("alpha_asm") ],

        cflags           => "-DL_ENDIAN",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

    },

    "linux-c64xplus" => {

        # TI_CGT_C6000_7.3.x is a requirement
@@ -832,7 +824,7 @@ 
        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread -D_THREAD_SAFE -D_REENTRANT",

        bn_ops           => "BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL",

        bn_ops           => "BN_LLONG",

        dso_scheme       => "dlfcn",

        shared_target    => "bsd-gcc-shared",

        shared_cflag     => "-fPIC",
@@ -840,7 +832,7 @@ 
    },

    "BSD-generic64" => {

        inherit_from     => [ "BSD-generic32" ],

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

    },



    "BSD-x86" => {
@@ -866,19 +858,19 @@ 
        # triggered by RIPEMD160 code.

        inherit_from     => [ "BSD-generic64", asm("sparcv9_asm") ],

        cflags           => "-DB_ENDIAN -DMD32_REG_T=int -Wall",

        bn_ops           => "BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR",

        bn_ops           => "BN_LLONG",

    },



    "BSD-ia64" => {

        inherit_from     => [ "BSD-generic64", asm("ia64_asm") ],

        cflags           => "-DL_ENDIAN -Wall",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

    },



    "BSD-x86_64" => {

        inherit_from     => [ "BSD-generic64", asm("x86_64_asm") ],

        cflags           => "-DL_ENDIAN -Wall",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

    },
@@ -969,7 +961,7 @@ 
        cflags           => "-O -DFILIO_H -Kalloca",

        thread_cflag     => "-Kthread",

        lflags           => "-lsocket -lnsl",

        bn_ops           => "BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}",

        bn_ops           => "BN_LLONG ${x86_gcc_des}",

        perlasm_scheme   => "elf-1",

        dso_scheme       => "dlfcn",

        shared_target    => "svr5-shared",
@@ -1092,7 +1084,7 @@ 
        cflags           => "-O -XLLML -XLLMK -XL -DB_ENDIAN -DCHARSET_EBCDIC",

        thread_cflag     => "(unknown)",

        lflags           => "-lsocket -lnsl",

        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",

        bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",

    },



# OS/390 Unix an EBCDIC-based Unix system on IBM mainframe
@@ -1103,7 +1095,7 @@ 
        cc               => "c89.sh",

        cflags           => "-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE",

        thread_cflag     => "(unknown)",

        bn_ops           => "THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR",

        bn_ops           => "THIRTY_TWO_BIT RC4_CHAR",

    },



#### Visual C targets
@@ -1125,7 +1117,7 @@ 
        inherit_from     => [ "VC-common", asm("ia64_asm") ],

        cflags           => add(" ", "-DUNICODE -D_UNICODE"),

        sys_id           => "WIN64I",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",

        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",

        bn_obj           => sub { my $r=join(" ",@_); $r=~s/bn\-//; $r; },

        rc4_obj          => "",

        perlasm_scheme   => "ias",
@@ -1135,7 +1127,7 @@ 
        inherit_from     => [ "VC-common", asm("x86_64_asm") ],

        cflags           => add(" ", "-DUNICODE -D_UNICODE"),

        sys_id           => "WIN64A",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",

        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",

        bn_obj           => sub { my $r=join(" ",@_); $r=~s/x86_64\-gcc/bn_asm/; $r; },

        perlasm_scheme   => "auto",

	build_scheme     => [ "mk1mf", "VC-W64" ],
@@ -1145,14 +1137,14 @@ 
        # configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'

        inherit_from     => [ "VC-common", asm("x86_asm") ],

        sys_id           => "WIN32",

        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",

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

        perlasm_scheme   => "win32n",

	build_scheme     => [ "mk1mf", "VC-W32" ],

    },

    "VC-CE" => {

        cc               => "cl",

        sys_id           => "WINCE",

        bn_ops           => "BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}",

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

        dso_scheme       => "win32",

	build_scheme     => [ "mk1mf", "VC-WCE" ],

    },
@@ -1161,7 +1153,7 @@ 
    "BC-32" => {

        cc               => "bcc32",

        sys_id           => "WIN32",

        bn_ops           => "BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN",

        bn_ops           => "BN_LLONG EXPORT_VAR_AS_FN",

        dso_scheme       => "win32",

	build_scheme     => [ "mk1mf", "BC" ],

    },
@@ -1201,7 +1193,7 @@ 
        thread_cflag     => "-D_MT",

        sys_id           => "MINGW64",

        lflags           => "-lws2_32 -lgdi32 -lcrypt32",

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN",

        bn_ops           => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",

        perlasm_scheme   => "mingw64",

        dso_scheme       => "win32",

        shared_target    => "cygwin-shared",
@@ -1249,7 +1241,7 @@ 
        debug_cflags     => "-g -O0",

        release_cflags   => "-O3",

        sys_id           => "CYGWIN",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "mingw64",

        dso_scheme       => "dlfcn",

        shared_target    => "cygwin-shared",
@@ -1358,7 +1350,7 @@ 
        thread_cflag     => "-D_REENTRANT",

        sys_id           => "MACOSX",

        lflags           => "-Wl,-search_paths_first%",

        bn_ops           => "BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_CHAR",

        perlasm_scheme   => "osx32",

        dso_scheme       => "dlfcn",

        shared_target    => "darwin-shared",
@@ -1375,7 +1367,7 @@ 
    "darwin64-ppc-cc" => {

        inherit_from     => [ "darwin-common", asm("ppc64_asm") ],

        cflags           => "-arch ppc64 -DB_ENDIAN",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        perlasm_scheme   => "osx64",

        shared_ldflag    => "-arch ppc64 -dynamiclib",

    },
@@ -1383,14 +1375,14 @@ 
        inherit_from     => [ "darwin-common", asm("x86_asm") ],

        cflags           => "-arch i386 -DL_ENDIAN",

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

        bn_ops           => "BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR",

        bn_ops           => "BN_LLONG RC4_INT",

        perlasm_scheme   => "macosx",

        shared_ldflag    => "-arch i386 -dynamiclib",

    },

    "darwin64-x86_64-cc" => {

        inherit_from     => [ "darwin-common", asm("x86_64_asm") ],

        cflags           => "-arch x86_64 -DL_ENDIAN -Wall",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "macosx",

        shared_ldflag    => "-arch x86_64 -dynamiclib",

    },
@@ -1428,7 +1420,7 @@ 
        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],

        cflags           => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",

        sys_id           => "iOS",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",

        perlasm_scheme   => "ios64",

    },

Configurations/90-team.conf

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        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",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        dso_scheme       => "dlfcn",

        shared_target    => "linux-shared",
@@ -99,7 +99,7 @@ 
        cc               => "clang",

        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",

        thread_cflag     => "${BSDthreads}",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        dso_scheme       => "dlfcn",

        shared_target    => "bsd-gcc-shared",
@@ -112,7 +112,7 @@ 
        cflags           => "-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",

        thread_cflag     => "${BSDthreads}",

        sys_id           => "MACOSX",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "macosx",

        dso_scheme       => "dlfcn",

        shared_target    => "darwin-shared",

Configurations/99-personal-ben.conf

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        cc               => "gcc",

        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",

        thread_cflag     => "${BSDthreads}",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        dso_scheme       => "dlfcn",

        shared_target    => "bsd-gcc-shared",
@@ -43,7 +43,7 @@ 
        cc               => "clang",

        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",

        thread_cflag     => "${BSDthreads}",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        dso_scheme       => "dlfcn",

        shared_target    => "bsd-gcc-shared",
@@ -55,7 +55,7 @@ 
        cc               => "gcc",

        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",

        thread_cflag     => "${BSDthreads}",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        dso_scheme       => "dlfcn",

        shared_target    => "bsd-gcc-shared",
@@ -84,7 +84,7 @@ 
        thread_cflag     => "-D_REENTRANT",

        sys_id           => "MACOSX",

        lflags           => "-Wl,-search_paths_first%",

        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "macosx",

        dso_scheme       => "dlfcn",

        shared_target    => "darwin-shared",

Configurations/99-personal-bodo.conf

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.