[opencryptoki/f16] fix unresolved symbols in TPM module (#830129)
Dan Horák
sharkcz at fedoraproject.org
Tue Jun 12 08:10:11 UTC 2012
commit 60cef69f035fad4e967044cef18f1f91d956a180
Author: Dan Horák <dan at danny.cz>
Date: Mon Jun 11 19:08:36 2012 +0200
fix unresolved symbols in TPM module (#830129)
opencryptoki-2.4.1-830129.patch | 87 +++++++++++++++++++++++++++++++++++++++
opencryptoki.spec | 8 +++-
2 files changed, 94 insertions(+), 1 deletions(-)
---
diff --git a/opencryptoki-2.4.1-830129.patch b/opencryptoki-2.4.1-830129.patch
new file mode 100644
index 0000000..46215b8
--- /dev/null
+++ b/opencryptoki-2.4.1-830129.patch
@@ -0,0 +1,87 @@
+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 --git a/opencryptoki.spec b/opencryptoki.spec
index ba9557d..35ba90b 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,13 +1,15 @@
Name: opencryptoki
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: CPL
Group: System Environment/Base
URL: http://sourceforge.net/projects/opencryptoki
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# the pkcs11 group is created and populated in scriptlet
Patch0: %{name}-2.3.2-do-not-create-group-in-pkcs11_startup.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=830129
+Patch1: %{name}-2.4.1-830129.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): shadow-utils coreutils sed
Requires(post): chkconfig
@@ -130,6 +132,7 @@ cryptographic hardware such as IBM 4764 or 4765 that uses the
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .bz830129
# Upstream tarball has unnecessary executable perms set on the sources
find . -name '*.[ch]' -print0 | xargs -0 chmod -x
@@ -262,6 +265,9 @@ exit 0
%changelog
+* Mon Jun 11 2012 Dan Horák <dan[at]danny.cz> - 2.4-2
+- fix unresolved symbols in TPM module (#830129)
+
* Thu Jul 07 2011 Dan Horák <dan[at]danny.cz> - 2.4-1
- new upstream release 2.4
More information about the scm-commits
mailing list