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
Changes for CHANGES: 8 added lines, 0 removed lines.
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

File changed.

Preview size limit exceeded, changes collapsed.

Configurations/90-team.conf

+3 −3
Changes for Configurations/90-team.conf: 3 added lines, 3 removed lines.
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
Changes for Configurations/99-personal-ben.conf: 4 added lines, 4 removed lines.
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.