rpms/coolkey/devel coolkey-cac-1.patch, NONE, 1.1 coolkey.spec, 1.38, 1.39

[Jack Magne]

Author: jmagne

Update of /cvs/pkgs/rpms/coolkey/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27784

Modified Files:
	coolkey.spec 
Added Files:
	coolkey-cac-1.patch 
Log Message:
Cac card crash fix, #606842.

coolkey-cac-1.patch:
 object.cpp |    4 ++++
 slot.cpp   |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE coolkey-cac-1.patch ---
diff -up ./src/coolkey/object.cpp.cac-1 ./src/coolkey/object.cpp
--- ./src/coolkey/object.cpp.cac-1	2010-06-23 04:46:35.726198827 -0700
+++ ./src/coolkey/object.cpp	2010-06-23 04:47:28.073827862 -0700
@@ -505,6 +505,10 @@ dataStart(const CKYByte *buf, unsigned i
     unsigned char tag;
     unsigned int used_length= 0;
 
+    if(!buf) {
+        return NULL;
+    }
+
     tag = buf[used_length++];
 
     /* blow out when we come to the end */
diff -up ./src/coolkey/slot.cpp.cac-1 ./src/coolkey/slot.cpp
--- ./src/coolkey/slot.cpp.cac-1	2010-06-23 04:46:22.718371631 -0700
+++ ./src/coolkey/slot.cpp	2010-06-23 04:57:04.417774402 -0700
@@ -2192,6 +2192,10 @@ Slot::readCACCertificateFirst(CKYBuffer 
 	if (throwException && (status != CKYSUCCESS)) {
 	    handleConnectionError();
 	}
+        
+        if(CKYBuffer_Size(cert) == 0) {
+            handleConnectionError();
+        }
 	return status;
     }
 


Index: coolkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- coolkey.spec	16 Jun 2010 22:28:13 -0000	1.38
+++ coolkey.spec	23 Jun 2010 20:38:06 -0000	1.39
@@ -22,7 +22,7 @@
 
 Name: coolkey
 Version: 1.1.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: CoolKey PKCS #11 module
 License: LGPLv2
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -33,6 +33,7 @@ Patch3: coolkey-latest.patch
 Patch4: coolkey-simple-bugs.patch
 Patch5: coolkey-thread-fix.patch
 Patch6: coolkey-cac.patch
+Patch7: coolkey-cac-1.patch
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -67,6 +68,7 @@ Linux Driver support to access the CoolK
 %patch4 -b .coolkey-simple-bugs
 %patch5 -b .coolkey-thread-fix
 %patch6 -b .cac
+%patch7 -b .cac-1
 
 %build
 autoconf
@@ -115,6 +117,8 @@ fi
 
 
 %changelog
+* Wed Jun 23 2010 Jack Magne <jmagne at redhat.com> - 1.1.0-16
+- fix possible crash when loading cac certs.
 * Wed Jun 16 2010 Robert Relyea <rrelyea at redhat.com> - 1.1.0-15
 - better cac support.