aboutsummaryrefslogtreecommitdiffstats
path: root/include/openssl/des.h
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 /include/openssl/des.h
parent8ed40b83ec19aab146a3df701c83066c8788a7a8 (diff)
downloadopenssl-3e9e810f2e047effb1056211794d2d12ec2b04e7.tar.gz
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 'include/openssl/des.h')
-rw-r--r--include/openssl/des.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/openssl/des.h b/include/openssl/des.h
index 3d784fa03a..649bc792ee 100644
--- a/include/openssl/des.h
+++ b/include/openssl/des.h
@@ -58,14 +58,13 @@
#ifndef HEADER_NEW_DES_H
# define HEADER_NEW_DES_H
-# include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG
- * (via openssl/opensslconf.h */
+# include <openssl/e_os2.h>
# ifdef OPENSSL_NO_DES
# error DES is disabled.
# endif
-# define DES_LONG OSSL_DES_LONG
+typedef unsigned int DES_LONG;
# ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN