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

des_old.h doesn't really need to include des.h, so don't. That will

Browse Source 
avoid clashes with other code that have their own DES_ functions but
really only use OpenSSL's old des_ functions.
This commit is contained in:
Richard Levitte 2001-11-06 11:37:14 +00:00
parent 6229a5607c
commit 7f558334ad
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/des/des_old.c
View File

@ -73,6 +73,7 @@
*/ */
#include <openssl/des_old.h> #include <openssl/des_old.h>
#include <openssl/des.h>
#include <openssl/rand.h> #include <openssl/rand.h>
const char *des_options(void) const char *des_options(void)

5
crypto/des/des_old.h
View File

@ -72,8 +72,8 @@
* *
*/ */
#ifndef HEADER_DES_COMP_H #ifndef HEADER_DES_OLD_H
#define HEADER_DES_COMP_H #define HEADER_DES_OLD_H
#ifdef OPENSSL_NO_DES #ifdef OPENSSL_NO_DES
#error DES is disabled. #error DES is disabled.
@ -85,7 +85,6 @@
#include <openssl/opensslconf.h> /* DES_LONG */ #include <openssl/opensslconf.h> /* DES_LONG */
#include <openssl/e_os2.h> /* OPENSSL_EXTERN */ #include <openssl/e_os2.h> /* OPENSSL_EXTERN */
#include <openssl/des.h>
#include <openssl/symhacks.h> #include <openssl/symhacks.h>
#ifdef OPENSSL_BUILD_SHLIBCRYPTO #ifdef OPENSSL_BUILD_SHLIBCRYPTO

1
crypto/des/destest.c
View File

@ -82,6 +82,7 @@ int main(int argc, char *argv[])
return(0); return(0);
} }
#else #else
#include <openssl/des.h>
#include <openssl/des_old.h> #include <openssl/des_old.h>
#if defined(PERL5) || defined(__FreeBSD__) #if defined(PERL5) || defined(__FreeBSD__)

2
crypto/opensslconf.h.in
View File

@ -47,7 +47,7 @@
#endif #endif
#endif #endif
#if defined(HEADER_DES_H) && !defined(DES_LONG) #if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */ * %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG #ifndef DES_LONG