generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the possibility to enable olde des support, not just disable it, for future support. Redocument

Browse Source
This commit is contained in:
Richard Levitte 2002-03-26 14:26:08 +00:00
parent 39335c356b
commit 600b77a93f
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CHANGES
View File

@ -363,19 +363,30 @@
+) Change all functions with names starting with des_ to be starting +) Change all functions with names starting with des_ to be starting
with DES_ instead. Add wrappers that are compatible with libdes, with DES_ instead. Add wrappers that are compatible with libdes,
but are named _ossl_old_des_*. Finally, add macros that map the but are named _ossl_old_des_*. Finally, add macros that map the
des_* symbols to the corresponding _ossl_old_des_*. des_* symbols to the corresponding _ossl_old_des_* if libdes
compatibility is desired. If OpenSSL 0.9.6c compatibility is
desired, the des_* symbols will be mapped to DES_*, with one
exception.
All this is done because there are increasing clashes with libdes Since we provide two compatibility mappings, the user needs to
and other DES libraries that are currently used by other projects. define the macro OPENSSL_DES_LIBDES_COMPATIBILITY if libdes
The old libdes interface (including crypt()) is provided if compatibility is desired. The default (i.e., when that macro
<openssl/des_old.h> is included. For now, this automatically isn't defined) is OpenSSL 0.9.6c compatibility.
happens in <openssl/des.h> unless OPENSSL_DISABLE_OLD_DES_SUPPORT is
defined. Note that crypt() is no longer declared in <openssl/des.h>. There are also macros that enable and disable the support of old
des functions altogether. Those are OPENSSL_ENABLE_OLD_DES_SUPPORT
and OPENSSL_DISABLE_OLD_DES_SUPPORT. If none or both of those
are defined, the default will apply: to support the old des routines.
In either case, one must include openssl/des.h to get the correct
definitions. Do not try to just include openssl/des_old.h, that
won't work.
NOTE: This is a major break of an old API into a new one. Software NOTE: This is a major break of an old API into a new one. Software
authors are encouraged to switch to the DES_ style functions. Some authors are encouraged to switch to the DES_ style functions. Some
time in the future, des_old.h and the libdes compatibility functions time in the future, des_old.h and the libdes compatibility functions
will be completely removed. will be disable (i.e. OPENSSL_DISABLE_OLD_DES_SUPPORT will be the
default), and then completely removed.
[Richard Levitte] [Richard Levitte]
*) Fix SSL handshake functions and SSL_clear() such that SSL_clear() *) Fix SSL handshake functions and SSL_clear() such that SSL_clear()

6
crypto/des/des.h
View File

@ -92,6 +92,12 @@ typedef struct DES_ks
} DES_key_schedule; } DES_key_schedule;
#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
# ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
# define OPENSSL_ENABLE_OLD_DES_SUPPORT
# endif
#endif
#ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
# include <openssl/des_old.h> # include <openssl/des_old.h>
#endif #endif