From c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:43:31 +0100 Subject: Upgraded to openssl-1.0.2 --- openssl/MacOS/opensslconf.h | 140 ++++++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 65 deletions(-) (limited to 'openssl/MacOS/opensslconf.h') diff --git a/openssl/MacOS/opensslconf.h b/openssl/MacOS/opensslconf.h index ad557cc06..bace0a1a2 100644 --- a/openssl/MacOS/opensslconf.h +++ b/openssl/MacOS/opensslconf.h @@ -1,116 +1,126 @@ /* MacOS/opensslconf.h */ #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ -#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define OPENSSLDIR "/usr/local/ssl" -#endif +# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) +# define OPENSSLDIR "/usr/local/ssl" +# endif #endif #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) -#define IDEA_INT unsigned int +# define IDEA_INT unsigned int #endif #if defined(HEADER_MD2_H) && !defined(MD2_INT) -#define MD2_INT unsigned int +# define MD2_INT unsigned int #endif #if defined(HEADER_RC2_H) && !defined(RC2_INT) /* I need to put in a mod for the alpha - eay */ -#define RC2_INT unsigned int +# define RC2_INT unsigned int #endif #if defined(HEADER_RC4_H) -#if !defined(RC4_INT) -/* using int types make the structure larger but make the code faster - * on most boxes I have tested - up to %20 faster. */ +# if !defined(RC4_INT) /* + * using int types make the structure larger but make the code faster on most + * boxes I have tested - up to %20 faster. + */ +/*- * I don't know what does "most" mean, but declaring "int" is a must on: * - Intel P6 because partial register stalls are very expensive; * - elder Alpha because it lacks byte load/store instructions; */ -#define RC4_INT unsigned char -#endif -#if !defined(RC4_CHUNK) +# define RC4_INT unsigned char +# endif +# if !defined(RC4_CHUNK) /* * This enables code handling data aligned at natural CPU word * boundary. See crypto/rc4/rc4_enc.c for further details. */ -#define RC4_CHUNK unsigned long -#endif +# define RC4_CHUNK unsigned long +# endif #endif #if defined(HEADER_DES_H) && !defined(DES_LONG) -/* 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). */ -#ifndef DES_LONG -#define DES_LONG unsigned long -#endif +/* + * 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). + */ +# ifndef DES_LONG +# define DES_LONG unsigned long +# endif #endif #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) -#define CONFIG_HEADER_BN_H -#if __option(longlong) +# define CONFIG_HEADER_BN_H +# if __option(longlong) # define BN_LLONG -#else +# else # undef BN_LLONG -#endif +# endif /* Should we define BN_DIV2W here? */ /* Only one for the following should be defined */ -/* The prime number generation stuff may not work when - * EIGHT_BIT but I don't care since I've only used this mode - * for debuging the bignum libraries */ -#undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT -#define THIRTY_TWO_BIT -#undef SIXTEEN_BIT -#undef EIGHT_BIT +/* + * The prime number generation stuff may not work when EIGHT_BIT but I don't + * care since I've only used this mode for debuging the bignum libraries + */ +# undef SIXTY_FOUR_BIT_LONG +# undef SIXTY_FOUR_BIT +# define THIRTY_TWO_BIT +# undef SIXTEEN_BIT +# undef EIGHT_BIT #endif #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) -#define CONFIG_HEADER_RC4_LOCL_H -/* if this is defined data[i] is used instead of *data, this is a %20 - * speedup on x86 */ -#undef RC4_INDEX +# define CONFIG_HEADER_RC4_LOCL_H +/* + * if this is defined data[i] is used instead of *data, this is a %20 speedup + * on x86 + */ +# undef RC4_INDEX #endif #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) -#define CONFIG_HEADER_BF_LOCL_H -#define BF_PTR -#endif /* HEADER_BF_LOCL_H */ +# define CONFIG_HEADER_BF_LOCL_H +# define BF_PTR +#endif /* HEADER_BF_LOCL_H */ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) -#define CONFIG_HEADER_DES_LOCL_H -/* the following is tweaked from a config script, that is why it is a - * protected undef/define */ -#ifndef DES_PTR -#define DES_PTR -#endif +# define CONFIG_HEADER_DES_LOCL_H +/* + * the following is tweaked from a config script, that is why it is a + * protected undef/define + */ +# ifndef DES_PTR +# define DES_PTR +# endif -/* This helps C compiler generate the correct code for multiple functional +/* + * This helps C compiler generate the correct code for multiple functional * units. It reduces register dependancies at the expense of 2 more - * registers */ -#ifndef DES_RISC1 -#define DES_RISC1 -#endif - -#ifndef DES_RISC2 -#undef DES_RISC2 -#endif - -#if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! -#endif - -/* Unroll the inner loop, this sometimes helps, sometimes hinders. - * Very mucy CPU dependant */ -#ifndef DES_UNROLL -#define DES_UNROLL -#endif + * registers + */ +# ifndef DES_RISC1 +# define DES_RISC1 +# endif -#endif /* HEADER_DES_LOCL_H */ +# ifndef DES_RISC2 +# undef DES_RISC2 +# endif +# if defined(DES_RISC1) && defined(DES_RISC2) +YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED ! !!!! +# endif +/* + * Unroll the inner loop, this sometimes helps, sometimes hinders. Very mucy + * CPU dependant + */ +# ifndef DES_UNROLL +# define DES_UNROLL +# endif +#endif /* HEADER_DES_LOCL_H */ #ifndef __POWERPC__ -#define MD32_XARRAY +# define MD32_XARRAY #endif -- cgit v1.2.3