--- a/components/openssl/openssl-1.0.1-fips-140/patches/29_fork_safe.patch Fri Jul 10 20:29:35 2015 +0000
+++ b/components/openssl/openssl-1.0.1-fips-140/patches/29_fork_safe.patch Fri Jul 10 14:15:09 2015 -0700
@@ -22,11 +22,11 @@
+static pthread_mutex_t *solaris_openssl_locks;
+
static void (MS_FAR *locking_callback) (int mode, int type,
- const char *file, int line) = 0;
+ const char *file, int line) = 0;
static int (MS_FAR *add_lock_callback) (int *pointer, int amount,
@@ -373,7 +376,10 @@
void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*func)
- (const char *file, int line))
+ (const char *file, int line))
{
- dynlock_create_callback = func;
+ /*
@@ -37,8 +37,8 @@
void CRYPTO_set_dynlock_lock_callback(void (*func) (int mode,
@@ -382,7 +388,10 @@
- const char *file,
- int line))
+ const char *file,
+ int line))
{
- dynlock_lock_callback = func;
+ /*
@@ -49,8 +49,8 @@
void CRYPTO_set_dynlock_destroy_callback(void (*func)
@@ -389,7 +398,10 @@
- (struct CRYPTO_dynlock_value *l,
- const char *file, int line))
+ (struct CRYPTO_dynlock_value *l,
+ const char *file, int line))
{
- dynlock_destroy_callback = func;
+ /*
@@ -186,7 +186,7 @@
+}
+
void CRYPTO_set_locking_callback(void (*func) (int mode, int type,
- const char *file, int line))
+ const char *file, int line))
{
@@ -410,7 +543,11 @@
* started.
@@ -242,8 +242,8 @@
--- openssl-1.0.1f/crypto/sparccpuid.S.~1~ Fri Feb 7 10:41:37 2014
+++ openssl-1.0.1f/crypto/sparccpuid.S Thu Feb 6 16:04:14 2014
@@ -398,5 +398,7 @@
- .size OPENSSL_cleanse,.-OPENSSL_cleanse
-
+ .size OPENSSL_cleanse,.-OPENSSL_cleanse
+
.section ".init",#alloc,#execinstr
+ call solaris_locking_setup
+ nop
@@ -260,15 +260,15 @@
.section .init
+ call solaris_locking_setup
call OPENSSL_cpuid_setup
-
+
.hidden OPENSSL_ia32cap_P
--- openssl-1.0.1f/crypto/x86cpuid.pl.~1~ Wed Feb 12 13:38:03 2014
+++ openssl-1.0.1f/crypto/x86cpuid.pl Wed Feb 12 13:38:31 2014
@@ -353,6 +353,7 @@
- &ret ();
+ &ret ();
&function_end_B("OPENSSL_ia32_rdrand");
-
+
+&initseg("solaris_locking_setup");
&initseg("OPENSSL_cpuid_setup");
-
+
&asm_finish();