Kent, Thanks! Changed merged.
regards,
Joy
Kent Yoder
<[email protected]
bm.com> To
[email protected],
06/11/2012 10:24 cc
AM
Subject
[Opencryptoki-tech] [PATCH] tpmtok,
swtok: Fix unresolved symbols
As reported by David Woodhouse in Redhat bugzilla 830129, there are
unresolved symbols in the common mech_ssl3.c code. This patch also fixes
an unresolved symbol in the TPM token logging code.
Signed-off-by: Kent Yoder <[email protected]>
---
usr/lib/pkcs11/cca_stdll/h_extern.h | 4 ----
usr/lib/pkcs11/common/h_extern.h | 4 ----
usr/lib/pkcs11/common/mech_ssl3.c | 20 ++++----------------
usr/lib/pkcs11/tpm_stdll/h_extern.h | 4 ----
usr/lib/pkcs11/tpm_stdll/key_mgr.c | 2 +-
5 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/usr/lib/pkcs11/cca_stdll/h_extern.h
b/usr/lib/pkcs11/cca_stdll/h_extern.h
index 03c3d22..07a63a3 100644
--- a/usr/lib/pkcs11/cca_stdll/h_extern.h
+++ b/usr/lib/pkcs11/cca_stdll/h_extern.h
@@ -1642,10 +1642,6 @@ CK_RV object_mgr_get_attribute_values( SESSION
* sess,
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 --git a/usr/lib/pkcs11/common/h_extern.h
b/usr/lib/pkcs11/common/h_extern.h
index c7c4406..8ecc634 100755
--- a/usr/lib/pkcs11/common/h_extern.h
+++ b/usr/lib/pkcs11/common/h_extern.h
@@ -1955,10 +1955,6 @@ CK_RV object_mgr_get_attribute_values( SESSION
* sess,
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 --git a/usr/lib/pkcs11/common/mech_ssl3.c
b/usr/lib/pkcs11/common/mech_ssl3.c
index 20921ac..4e7a9be 100755
--- a/usr/lib/pkcs11/common/mech_ssl3.c
+++ b/usr/lib/pkcs11/common/mech_ssl3.c
@@ -1746,16 +1746,7 @@ ssl3_key_and_mac_derive( SESSION * sess,
#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 * sess,
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 *
sess,
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 --git a/usr/lib/pkcs11/tpm_stdll/h_extern.h
b/usr/lib/pkcs11/tpm_stdll/h_extern.h
index 1dddafd..e6b14fb 100644
--- a/usr/lib/pkcs11/tpm_stdll/h_extern.h
+++ b/usr/lib/pkcs11/tpm_stdll/h_extern.h
@@ -1533,10 +1533,6 @@ CK_RV object_mgr_get_attribute_values( SESSION
* sess,
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 --git a/usr/lib/pkcs11/tpm_stdll/key_mgr.c
b/usr/lib/pkcs11/tpm_stdll/key_mgr.c
index 579e65f..c367b19 100644
--- a/usr/lib/pkcs11/tpm_stdll/key_mgr.c
+++ b/usr/lib/pkcs11/tpm_stdll/key_mgr.c
@@ -844,7 +844,7 @@ key_mgr_unwrap_key( SESSION * sess,
//
break;
default:
- OCK_LOG_ERROR(ERR_MECHANISM_INVALID);
+ OCK_LOG_ERR(ERR_MECHANISM_INVALID);
return CKR_MECHANISM_INVALID;
}
--
1.7.5.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
<<inline: graycol.gif>>
<<inline: pic21542.gif>>
<<inline: ecblank.gif>>
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
