100 lines
4.2 KiB
Diff
100 lines
4.2 KiB
Diff
diff -X /root/gitignore -pburN opencryptoki-2.4.1/usr/lib/pkcs11/cca_stdll/h_extern.h opencryptoki-2.4.1-key/usr/lib/pkcs11/cca_stdll/h_extern.h
|
|
--- opencryptoki-2.4.1/usr/lib/pkcs11/cca_stdll/h_extern.h 2012-02-22 13:37:51.000000000 -0600
|
|
+++ opencryptoki-2.4.1-key/usr/lib/pkcs11/cca_stdll/h_extern.h 2012-06-11 09:56:02.509036554 -0500
|
|
@@ -1642,10 +1642,6 @@ CK_RV object_mgr_get_attribute_values
|
|
CK_RV object_mgr_get_object_size( CK_OBJECT_HANDLE handle,
|
|
CK_ULONG * size );
|
|
|
|
-CK_BBOOL object_mgr_invalidate_handle1( CK_OBJECT_HANDLE handle );
|
|
-
|
|
-CK_BBOOL object_mgr_invalidate_handle2( OBJECT *obj );
|
|
-
|
|
CK_BBOOL object_mgr_purge_session_objects( SESSION * sess,
|
|
SESS_OBJ_TYPE type );
|
|
|
|
diff -X /root/gitignore -pburN opencryptoki-2.4.1/usr/lib/pkcs11/common/h_extern.h opencryptoki-2.4.1-key/usr/lib/pkcs11/common/h_extern.h
|
|
--- opencryptoki-2.4.1/usr/lib/pkcs11/common/h_extern.h 2012-02-22 13:37:51.000000000 -0600
|
|
+++ opencryptoki-2.4.1-key/usr/lib/pkcs11/common/h_extern.h 2012-06-11 09:56:02.510036534 -0500
|
|
@@ -1955,10 +1955,6 @@ CK_RV object_mgr_get_attribute_values
|
|
CK_RV object_mgr_get_object_size( CK_OBJECT_HANDLE handle,
|
|
CK_ULONG * size );
|
|
|
|
-CK_BBOOL object_mgr_invalidate_handle1( CK_OBJECT_HANDLE handle );
|
|
-
|
|
-CK_BBOOL object_mgr_invalidate_handle2( OBJECT *obj );
|
|
-
|
|
CK_BBOOL object_mgr_purge_session_objects( SESSION * sess,
|
|
SESS_OBJ_TYPE type );
|
|
|
|
diff -X /root/gitignore -pburN opencryptoki-2.4.1/usr/lib/pkcs11/common/mech_ssl3.c opencryptoki-2.4.1-key/usr/lib/pkcs11/common/mech_ssl3.c
|
|
--- opencryptoki-2.4.1/usr/lib/pkcs11/common/mech_ssl3.c 2012-02-22 13:37:51.000000000 -0600
|
|
+++ opencryptoki-2.4.1-key/usr/lib/pkcs11/common/mech_ssl3.c 2012-06-11 09:56:02.510036534 -0500
|
|
@@ -1746,16 +1746,7 @@ ssl3_key_and_mac_derive( SESSION
|
|
#endif
|
|
}
|
|
|
|
- return rc;
|
|
-
|
|
error:
|
|
-
|
|
- if (client_write_handle != 0)
|
|
- object_mgr_invalidate_handle1( client_write_handle );
|
|
-
|
|
- if (server_write_handle != 0)
|
|
- object_mgr_invalidate_handle1( server_write_handle );
|
|
-
|
|
return rc;
|
|
}
|
|
|
|
@@ -1917,8 +1908,8 @@ ssl3_kmd_process_mac_keys( SESSION
|
|
return CKR_OK;
|
|
|
|
error:
|
|
- if (*client_handle != 0) object_mgr_invalidate_handle1( *client_handle );
|
|
- if (*server_handle != 0) object_mgr_invalidate_handle1( *server_handle );
|
|
+ *client_handle = 0;
|
|
+ *server_handle = 0;
|
|
|
|
if (client_obj) {
|
|
object_free( client_obj );
|
|
@@ -2173,11 +2164,8 @@ ssl3_kmd_process_write_keys( SESSION
|
|
return CKR_OK;
|
|
|
|
error:
|
|
- if (*client_handle != 0)
|
|
- object_mgr_invalidate_handle1( *client_handle );
|
|
-
|
|
- if (*server_handle != 0)
|
|
- object_mgr_invalidate_handle1( *server_handle );
|
|
+ *client_handle = 0;
|
|
+ *server_handle = 0;
|
|
|
|
if (client_obj)
|
|
object_free( client_obj );
|
|
diff -X /root/gitignore -pburN opencryptoki-2.4.1/usr/lib/pkcs11/tpm_stdll/h_extern.h opencryptoki-2.4.1-key/usr/lib/pkcs11/tpm_stdll/h_extern.h
|
|
--- opencryptoki-2.4.1/usr/lib/pkcs11/tpm_stdll/h_extern.h 2012-02-22 13:37:51.000000000 -0600
|
|
+++ opencryptoki-2.4.1-key/usr/lib/pkcs11/tpm_stdll/h_extern.h 2012-06-11 09:56:02.511036516 -0500
|
|
@@ -1533,10 +1533,6 @@ CK_RV object_mgr_get_attribute_values
|
|
CK_RV object_mgr_get_object_size( CK_OBJECT_HANDLE handle,
|
|
CK_ULONG * size );
|
|
|
|
-CK_BBOOL object_mgr_invalidate_handle1( CK_OBJECT_HANDLE handle );
|
|
-
|
|
-CK_BBOOL object_mgr_invalidate_handle2( OBJECT *obj );
|
|
-
|
|
CK_BBOOL object_mgr_purge_session_objects( SESSION * sess,
|
|
SESS_OBJ_TYPE type );
|
|
|
|
diff -X /root/gitignore -pburN opencryptoki-2.4.1/usr/lib/pkcs11/tpm_stdll/key_mgr.c opencryptoki-2.4.1-key/usr/lib/pkcs11/tpm_stdll/key_mgr.c
|
|
--- opencryptoki-2.4.1/usr/lib/pkcs11/tpm_stdll/key_mgr.c 2012-02-22 13:37:51.000000000 -0600
|
|
+++ opencryptoki-2.4.1-key/usr/lib/pkcs11/tpm_stdll/key_mgr.c 2012-06-11 09:42:48.351005308 -0500
|
|
@@ -844,7 +844,7 @@ key_mgr_unwrap_key( SESSION *
|
|
//
|
|
break;
|
|
default:
|
|
- OCK_LOG_ERROR(ERR_MECHANISM_INVALID);
|
|
+ OCK_LOG_ERR(ERR_MECHANISM_INVALID);
|
|
return CKR_MECHANISM_INVALID;
|
|
}
|
|
|