Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,
DES_LONG and OPENSSL_NO_DESCBCM.
This commit is contained in:
parent
0c7d61ee0e
commit
0f3879455b
3 changed files with 7 additions and 5 deletions
|
@ -59,13 +59,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 */
|
||||
|
||||
#ifdef OPENSSL_NO_DES
|
||||
#error DES is disabled.
|
||||
#endif
|
||||
|
||||
#include <openssl/opensslconf.h> /* DES_LONG */
|
||||
#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
|
||||
|
||||
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
|
||||
# undef OPENSSL_EXTERN
|
||||
# define OPENSSL_EXTERN OPENSSL_EXPORT
|
||||
|
|
|
@ -91,6 +91,8 @@
|
|||
#ifndef HEADER_DES_H
|
||||
#define HEADER_DES_H
|
||||
|
||||
#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
|
||||
|
||||
#ifdef OPENSSL_NO_DES
|
||||
#error DES is disabled.
|
||||
#endif
|
||||
|
@ -103,8 +105,6 @@
|
|||
#error <openssl/des_old.h> replaces <kerberos/des.h>.
|
||||
#endif
|
||||
|
||||
#include <openssl/opensslconf.h> /* DES_LONG */
|
||||
#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
|
||||
#include <openssl/symhacks.h>
|
||||
|
||||
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
|
||||
|
|
|
@ -68,6 +68,8 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
|
|||
|
||||
*/
|
||||
|
||||
#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_DESCBCM is defined */
|
||||
|
||||
#ifndef OPENSSL_NO_DESCBCM
|
||||
#include "des_locl.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue