Commit 0f387945 authored Mar 20, 2003 by Richard Levitte

Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,

DES_LONG and OPENSSL_NO_DESCBCM.

parent 0c7d61ee

crypto/des/des.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

crypto/des/des_old.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

crypto/des/ede_cbcm_enc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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"