# HG changeset patch
# User haimay
# Date 1189202333 25200
# Node ID cc3cba45b2367d90a9d70fedd453dd263dec50b1
# Parent  335da2816bbe199e70a95d100346ada282171866
6596364 pkcs11 engine cannot be used with apache due to SSL_R_DIGEST_CHECK_FAILED error

diff -r 335da2816bbe -r cc3cba45b236 usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h	Fri Sep 07 12:16:51 2007 -0700
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h	Fri Sep 07 14:58:53 2007 -0700
@@ -418,6 +418,8 @@
 	CK_FLAGS	op_type;
 	CK_ULONG	op_slotnum;
 	CK_ULONG	op_state_len;
+	boolean_t	op_init_app;
+	boolean_t	op_init_done;
 } opstate_data_t;
 
 struct metaopstate {
diff -r 335da2816bbe -r cc3cba45b236 usr/src/lib/pkcs11/libpkcs11/common/metaSession.c
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaSession.c	Fri Sep 07 12:16:51 2007 -0700
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaSession.c	Fri Sep 07 14:58:53 2007 -0700
@@ -313,6 +313,8 @@
 		opstate.state[0].op_slotnum = slot_session->slotnum;
 		opstate.state[0].op_state_len = *pulOperationStateLen -
 		    sizeof (meta_opstate_t);
+		opstate.state[0].op_init_app = session->init.app;
+		opstate.state[0].op_init_done = session->init.done;
 		rv = FUNCLIST(slot_session->fw_st_id)->C_GetOperationState(
 		    slot_session->hSession,
 		    pOperationState + sizeof (meta_opstate_t),
@@ -470,6 +472,8 @@
 
 		session->op1.type = opstate.state[0].op_type;
 		session->op1.session = slot_session;
+		session->init.app = opstate.state[0].op_init_app;
+		session->init.done = opstate.state[0].op_init_done;
 
 		rv = meta_set_opstate(slot_session, meta_enc_key,
 		    meta_auth_key, &(opstate.state[0]),