diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-27 18:43:25 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-27 19:05:50 -0500 |
| commit | 3e9e810f2e047effb1056211794d2d12ec2b04e7 (patch) | |
| tree | 26c730915e8c56590fa8fc148da2651dab7f7c8c /crypto/des/ecb_enc.c | |
| parent | 8ed40b83ec19aab146a3df701c83066c8788a7a8 (diff) | |
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: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/des/ecb_enc.c')
| -rw-r--r-- | crypto/des/ecb_enc.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 56a6a0b4da..109ffd430f 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -66,34 +66,13 @@ const char *DES_options(void) static char buf[32]; if (init) { - const char *ptr, *unroll, *risc, *size; + const char *size; -#ifdef DES_PTR - ptr = "ptr"; -#else - ptr = "idx"; -#endif -#if defined(DES_RISC1) || defined(DES_RISC2) -# ifdef DES_RISC1 - risc = "risc1"; -# endif -# ifdef DES_RISC2 - risc = "risc2"; -# endif -#else - risc = "cisc"; -#endif -#ifdef DES_UNROLL - unroll = "16"; -#else - unroll = "2"; -#endif if (sizeof(DES_LONG) != sizeof(long)) size = "int"; else size = "long"; - BIO_snprintf(buf, sizeof buf, "des(%s,%s,%s,%s)", ptr, risc, unroll, - size); + BIO_snprintf(buf, sizeof buf, "des(%s)", size); init = 0; } return (buf); |