From 539d9c9b882d880942acd66a1054f62e5d48683d Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 5 Feb 2021 13:26:34 +0100
Subject: [PATCH] pcsc-lite-ccid-1.4.34-1

---
 .gitignore                     | 1 +
 ccid-1.4.26-omnikey-3121.patch | 6 +++---
 pcsc-lite-ccid.spec            | 7 +++++--
 sources                        | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 352260c..ee5e017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /ccid-1.4.31.tar.bz2.asc
 /ccid-1.4.32.tar.bz2.asc
 /ccid-1.4.33.tar.bz2.asc
+/ccid-1.4.34.tar.bz2.asc
diff --git a/ccid-1.4.26-omnikey-3121.patch b/ccid-1.4.26-omnikey-3121.patch
index d1b97cd..98bab90 100644
--- a/ccid-1.4.26-omnikey-3121.patch
+++ b/ccid-1.4.26-omnikey-3121.patch
@@ -123,11 +123,11 @@ diff -up ccid-1.4.26/src/commands.c.omnikey ccid-1.4.26/src/commands.c
  		*rx_length = length;
  	else
 @@ -1581,7 +1630,7 @@ time_request:
- 		return_value = IFD_COMMUNICATION_ERROR;
  	}
  	else
--		memcpy(rx_buffer, cmd+10, length);
-+		memcpy(rx_buffer, rx_ptr, length);
+		if (length)
+-			memcpy(rx_buffer, cmd+10, length);
++			memcpy(rx_buffer, rx_ptr, length);
  
  	/* Extended case?
  	 * Only valid for RDR_to_PC_DataBlock frames */
diff --git a/pcsc-lite-ccid.spec b/pcsc-lite-ccid.spec
index 2d80a5e..a980ae2 100644
--- a/pcsc-lite-ccid.spec
+++ b/pcsc-lite-ccid.spec
@@ -2,8 +2,8 @@
 %global pcsc_lite_ver 1.8.9
 
 Name:           pcsc-lite-ccid
-Version:        1.4.33
-Release:        3%{dist}
+Version:        1.4.34
+Release:        1%{dist}
 Summary:        Generic USB CCID smart card reader driver
 
 License:        LGPLv2+
@@ -66,6 +66,9 @@ cp -p src/openct/LICENSE LICENSE.openct
 
 
 %changelog
+* Fri Feb 05 2021 Jakub Jelen <jjelen@redhat.com> - 1.4.34-1
+- New upstream release
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.33-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index c8c6b49..6451e80 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ccid-1.4.33.tar.bz2) = ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
-SHA512 (ccid-1.4.33.tar.bz2.asc) = d1a4a4a4831cd0a7124ffc6b82ee0f730a716c9254a502ae0acc2706f5769736bec607ead218c043f46abc048e8bfc5a3d17058fc69e708dd9af4cf900db9728
+SHA512 (ccid-1.4.34.tar.bz2) = 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
+SHA512 (ccid-1.4.34.tar.bz2.asc) = b28ef35abb6994590e113614f4290c5a9c113fbb3fddbc5302361b1c424fd5fc0dcad2105e99b20071d1e36ede4664e90414293dc2b2e469b6a673d1505ccba5