summaryrefslogtreecommitdiffstats
path: root/crypto/idea
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-01-27 18:43:25 -0500
committerRich Salz <rsalz@openssl.org>2016-01-27 19:05:50 -0500
commit3e9e810f2e047effb1056211794d2d12ec2b04e7 (patch)
tree26c730915e8c56590fa8fc148da2651dab7f7c8c /crypto/idea
parent8ed40b83ec19aab146a3df701c83066c8788a7a8 (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/idea')
-rw-r--r--crypto/idea/i_ecb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
index c018c1504f..e7eeb4f937 100644
--- a/crypto/idea/i_ecb.c
+++ b/crypto/idea/i_ecb.c
@@ -61,10 +61,7 @@
const char *idea_options(void)
{
- if (sizeof(short) != sizeof(IDEA_INT))
- return ("idea(int)");
- else
- return ("idea(short)");
+ return ("idea(int)");
}
void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,