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 /makevms.com | |
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 'makevms.com')
-rwxr-xr-x | makevms.com | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/makevms.com b/makevms.com index ed0ac04860..02e0cf2eba 100755 --- a/makevms.com +++ b/makevms.com @@ -580,20 +580,10 @@ $! $ WRITE H_FILE "#if defined(HEADER_RC4_H)" $ WRITE H_FILE "#undef RC4_INT" $ WRITE H_FILE "#define RC4_INT unsigned int" -$ WRITE H_FILE "#undef RC4_CHUNK" -$ WRITE H_FILE "#define RC4_CHUNK unsigned long long" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)" -$ WRITE H_FILE "#undef OSSL_DES_LONG" -$ WRITE H_FILE "#define OSSL_DES_LONG unsigned int" -$ WRITE H_FILE "#undef DES_PTR" -$ WRITE H_FILE "#define DES_PTR" -$ WRITE H_FILE "#undef DES_RISC1" -$ WRITE H_FILE "#undef DES_RISC2" -$ WRITE H_FILE "#define DES_RISC1" -$ WRITE H_FILE "#undef DES_UNROLL" -$ WRITE H_FILE "#define DES_UNROLL" +$ WRITE H_FILE "typedef unsigned int OSSL_DES_LONG;" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_BN_H)" @@ -617,18 +607,10 @@ $! $ WRITE H_FILE "#if defined(HEADER_RC4_H)" $ WRITE H_FILE "#undef RC4_INT" $ WRITE H_FILE "#define RC4_INT unsigned char" -$ WRITE H_FILE "#undef RC4_CHUNK" -$ WRITE H_FILE "#define RC4_CHUNK unsigned long" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)" -$ WRITE H_FILE "#undef OSSL_DES_LONG" -$ WRITE H_FILE "#define OSSL_DES_LONG unsigned long" -$ WRITE H_FILE "#undef DES_PTR" -$ WRITE H_FILE "#define DES_PTR" -$ WRITE H_FILE "#undef DES_RISC1" -$ WRITE H_FILE "#undef DES_RISC2" -$ WRITE H_FILE "#undef DES_UNROLL" +$ WRITE H_FILE "typedef unsigned int OSSL_DES_LONG;" $ WRITE H_FILE "#endif" $! $ WRITE H_FILE "#if defined(HEADER_BN_H)" |