diff -r 6fd15d2c5471 -r 2d3ec080d6a3 components/openssl/openssl-0.9.8-fips-140/patches-post-config/opensslconf.patch --- a/components/openssl/openssl-0.9.8-fips-140/patches-post-config/opensslconf.patch Mon Dec 09 12:34:37 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ ---- /tmp/opensslconf.h Thu Mar 10 06:46:57 2011 -+++ /tmp/opensslconf.h.new Thu Mar 10 06:47:41 2011 -@@ -2,6 +2,12 @@ - /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ - - /* OpenSSL was configured with the following options: */ -+#if defined(__sparcv9) -+#ifndef OPENSSL_SYSNAME_ULTRASPARC -+# define OPENSSL_SYSNAME_ULTRASPARC -+#endif -+#endif -+ - #ifndef OPENSSL_DOING_MAKEDEPEND - - -@@ -205,10 +211,14 @@ - - #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ - #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -+#if defined(__sparcv9) || defined(__x86_64) -+#define ENGINESDIR "/lib/openssl/engines/64" -+#else - #define ENGINESDIR "/lib/openssl/engines" --#define OPENSSLDIR "/etc/openssl" - #endif -+#define OPENSSLDIR "/etc/openssl/fips-140" - #endif -+#endif - - #undef OPENSSL_UNISTD - #define OPENSSL_UNISTD -@@ -252,13 +262,21 @@ - /* 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 -+#if defined(__sparcv9) || defined(__x86_64) -+#define DES_LONG unsigned int -+#else - #define DES_LONG unsigned long - #endif - #endif -+#endif - - #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) - #define CONFIG_HEADER_BN_H -+#if defined(__sparcv9) || defined(__x86_64) -+#undef BN_LLONG -+#else - #define BN_LLONG -+#endif - - /* Should we define BN_DIV2W here? */ - -@@ -266,9 +284,14 @@ - /* 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 */ -+#if defined(__sparcv9) || defined(__x86_64) -+#define SIXTY_FOUR_BIT_LONG -+#undef THIRTY_TWO_BIT -+#else - #undef SIXTY_FOUR_BIT_LONG --#undef SIXTY_FOUR_BIT - #define THIRTY_TWO_BIT -+#endif -+#undef SIXTY_FOUR_BIT - #undef SIXTEEN_BIT - #undef EIGHT_BIT - #endif