[Pkg-coolkey-commits] r56 - in /coolkey/trunk/debian: changelog patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch patches/series

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Apr  9 15:08:07 2012
New Revision: 56

URL: http://svn.debian.org/wsvn/pkg-coolkey/?sc=1&rev=56
Log:
Fix "Coolkey don't working with ActiveKey Sim" proposed patch applied
(Closes: #634870)

Added:
    coolkey/trunk/debian/patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch
Modified:
    coolkey/trunk/debian/changelog
    coolkey/trunk/debian/patches/series

Modified: coolkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/changelog?rev=56&op=diff
==============================================================================
--- coolkey/trunk/debian/changelog (original)
+++ coolkey/trunk/debian/changelog Mon Apr  9 15:08:07 2012
@@ -1,9 +1,11 @@
-coolkey (1.1.0-11) UNRELEASED; urgency=low
+coolkey (1.1.0-11) unstable; urgency=low
 
   * debian/control: Fix libckyapplet1-dev_1.1.0-10_amd64.deb: package says
     section is libdevel, override says devel.
+  * Fix "Coolkey don't working with ActiveKey Sim" proposed patch applied
+    (Closes: #634870)
 
- -- Ludovic Rousseau <rousseau at debian.org>  Sun, 07 Aug 2011 16:05:50 +0200
+ -- Ludovic Rousseau <rousseau at debian.org>  Mon, 09 Apr 2012 16:46:15 +0200
 
 coolkey (1.1.0-10) unstable; urgency=low
 

Added: coolkey/trunk/debian/patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch?rev=56&op=file
==============================================================================
--- coolkey/trunk/debian/patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch (added)
+++ coolkey/trunk/debian/patches/0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch Mon Apr  9 15:08:07 2012
@@ -1,0 +1,25 @@
+From f184e5a538caa9412fa3b0e99afe92473fbd6739 Mon Sep 17 00:00:00 2001
+From: Vladimir Kravets <vova.kravets at gmail.com>
+Date: Mon, 23 May 2011 17:17:43 +0300
+Subject: [PATCH] Fix working with empty certificates in not zero slots.
+
+---
+ coolkey-1.1.0/src/coolkey/slot.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/coolkey-1.1.0/src/coolkey/slot.cpp b/coolkey-1.1.0/src/coolkey/slot.cpp
+index 4c734b7..4c10e8a 100644
+--- a/src/coolkey/slot.cpp
++++ b/src/coolkey/slot.cpp
+@@ -2193,7 +2193,7 @@ Slot::readCACCertificateFirst(CKYBuffer *cert, CKYSize *nextSize,
+ 	    handleConnectionError();
+ 	}
+         
+-        if(CKYBuffer_Size(cert) == 0) {
++        if(throwException && CKYBuffer_Size(cert) == 0) {
+             handleConnectionError();
+         }
+ 	return status;
+-- 
+1.7.4.1
+

Modified: coolkey/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/series?rev=56&op=diff
==============================================================================
--- coolkey/trunk/debian/patches/series (original)
+++ coolkey/trunk/debian/patches/series Mon Apr  9 15:08:07 2012
@@ -7,3 +7,4 @@
 coolkey-thread-fix.patch
 coolkey-cac.patch
 coolkey-cac-1.patch
+0001-Fix-working-with-empty-certificates-in-not-zero-slot.patch