7099856 Apache HTTP server crashes when tested with TLSv1 using OpenSSL T4 engine s11
authorHuie-Ying Lee <huieying.lee@oracle.com>
Mon, 17 Oct 2011 14:01:53 -0700
changeset 537 10bd3a98a582
parent 536 cc30c1136ebb
child 538 d8d7345db00f
child 2227 972345a3c215
7099856 Apache HTTP server crashes when tested with TLSv1 using OpenSSL T4 engine
components/openssl/openssl-1.0.0/engines/t4/eng_t4.c
--- a/components/openssl/openssl-1.0.0/engines/t4/eng_t4.c	Fri Oct 14 15:51:54 2011 -0700
+++ b/components/openssl/openssl-1.0.0/engines/t4/eng_t4.c	Mon Oct 17 14:01:53 2011 -0700
@@ -909,17 +909,15 @@
 static int
 t4_bind(ENGINE *e)
 {
-	static int aes_engage = -1, digest_engage = -1;
+	static int aes_engage = -1;
 
 	if (aes_engage == -1) {
 		aes_engage = (t4_aes_instructions_present() != 0);
 	}
-	if (digest_engage == -1) {
-		digest_engage = (t4_digest_instructions_present() != 0);
-	}
+
 #ifdef DEBUG_T4
 	(void) fprintf(stderr,
-	    "t4_bind: engage aes=%d, digest=%d\n", aes_engage, digest_engage);
+	    "t4_bind: engage aes=%d\n", aes_engage);
 #endif
 
 #ifndef  SOLARIS_NO_AES_CTR
@@ -950,7 +948,6 @@
 	    aes_engage ? ENGINE_T4_NAME: ENGINE_NO_T4_NAME) ||
 	    !ENGINE_set_init_function(e, t4_init) ||
 	    (aes_engage && !ENGINE_set_ciphers(e, t4_get_all_ciphers)) ||
-	    (digest_engage && !ENGINE_set_digests(e, t4_get_all_digests)) ||
 	    !ENGINE_set_destroy_function(e, t4_destroy)) {
 		T4_FREE_AES_CTR_NIDS;
 		return (0);