bump 2.3.0

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>

4 files changed, 31 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6a27f238dc2..31144e340a84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = yubico-piv-tool
 	pkgdesc = Tool to interact with the PIV applet on a YubiKey NEO
-	pkgver = 2.2.1
+	pkgver = 2.3.0
 	pkgrel = 1
 	url = https://developers.yubico.com/yubico-piv-tool/
 	arch = aarch64
@@ -15,22 +15,24 @@ pkgbase = yubico-piv-tool
 	depends = pcsclite
 	depends = openssl
 	options = !libtool
-	source = https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.2.1.tar.gz
-	source = https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.2.1.tar.gz.sig
+	source = https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.3.0.tar.gz
+	source = https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.3.0.tar.gz.sig
+	source = ykcs11-test-unassigned-var.patch
 	validpgpkeys = 0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A
 	validpgpkeys = 20EE325B86A81BCBD3E56798F04367096FBA95E8
 	validpgpkeys = B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A
 	validpgpkeys = FF8AF719AE5828181B894D831CE39268A0973948
 	validpgpkeys = B6042E2BD1FDBC2BCA8588B2FF8D3B45B7B875A9
-	validpgpkeys = 8D0B4EBA9345254BCEC0E843514F078FF4AB24C3
 	validpgpkeys = 57A9DEED4C6D962A923BB691816F3ED99921835E
 	validpgpkeys = 268583B64786F50F807456DA8CED3A80D41C0DCB
 	validpgpkeys = 1D7308B0055F5AEF36944A8F27A9C24D9588EA0F
 	validpgpkeys = 355C8C0186CC96CBA49F9CD8DAA17C2953914D9D
 	validpgpkeys = 9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1
 	validpgpkeys = 7FBB6186957496D58C751AC20E777DD85755AA4A
-	validpgpkeys = DCB904FAB343CFA719076EF79EA90242958E0658
-	md5sums = fdd64e16da13c464cfb0c7999b407cec
+	validpgpkeys = EE90AE0D19774C8386628FAAB428949EF7914718
+	validpgpkeys = 78D997D53E9C0A2A205392ED14A19784723C9988
+	md5sums = b05ccce29454183f7f58dea00ef169e2
 	md5sums = SKIP
+	md5sums = 66f948d5e90ef34fbff35791a173d928
 
 pkgname = yubico-piv-tool
diff --git a/.gitignore b/.gitignore
index 8a7d0592ae08..22f0d0073128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 !/PKGBUILD
 !/.SRCINFO
 !/*.install
+!/*.patch
diff --git a/PKGBUILD b/PKGBUILD
index aa46234fd804..93dbcfc19172 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: travisghansen <travisghansen@yahoo.com>
 
 pkgname=yubico-piv-tool
-pkgver=2.2.1
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="Tool to interact with the PIV applet on a YubiKey NEO"
 arch=('aarch64' 'armv7h' 'i686' 'x86_64')
@@ -12,24 +12,31 @@ url=https://developers.yubico.com/yubico-piv-tool/
 source=(
  "https://developers.yubico.com/yubico-piv-tool/Releases/${pkgname}-${pkgver}.tar.gz"
  "https://developers.yubico.com/yubico-piv-tool/Releases/${pkgname}-${pkgver}.tar.gz.sig"
+ "ykcs11-test-unassigned-var.patch"
 )
-md5sums=('fdd64e16da13c464cfb0c7999b407cec'
-         'SKIP')
+md5sums=('b05ccce29454183f7f58dea00ef169e2'
+         'SKIP'
+         '66f948d5e90ef34fbff35791a173d928')
 validpgpkeys=('0A3B0262BCA1705307D5FF06BCA00FD4B2168C0A'
               '20EE325B86A81BCBD3E56798F04367096FBA95E8'
               'B70D62AA6A31AD6B9E4F9F4BDC8888925D25CA7A'
               'FF8AF719AE5828181B894D831CE39268A0973948'
               'B6042E2BD1FDBC2BCA8588B2FF8D3B45B7B875A9'
-              '8D0B4EBA9345254BCEC0E843514F078FF4AB24C3'
               '57A9DEED4C6D962A923BB691816F3ED99921835E'
               '268583B64786F50F807456DA8CED3A80D41C0DCB'
               '1D7308B0055F5AEF36944A8F27A9C24D9588EA0F'
               '355C8C0186CC96CBA49F9CD8DAA17C2953914D9D'
               '9E885C0302F9BB9167529C2D5CBA11E6ADC7BCD1'
               '7FBB6186957496D58C751AC20E777DD85755AA4A'
-              'DCB904FAB343CFA719076EF79EA90242958E0658')
+              'EE90AE0D19774C8386628FAAB428949EF7914718'
+              '78D997D53E9C0A2A205392ED14A19784723C9988')
 options=(!libtool)
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/ykcs11-test-unassigned-var.patch"
+}
+
 build() {
   cmake -B build -S "${pkgname}-${pkgver}" \
       -DCMAKE_BUILD_TYPE='None' \
diff --git a/ykcs11-test-unassigned-var.patch b/ykcs11-test-unassigned-var.patch
new file mode 100644
index 000000000000..34ad5c2fbac3
--- /dev/null
+++ b/ykcs11-test-unassigned-var.patch
@@ -0,0 +1,10 @@
+--- yubico-piv-tool-2.3.0/ykcs11/tests/ykcs11_tests_util.c	2022-02-23 08:54:47.000000000 -0500
++++ yubico-piv-tool-2.3.0.patch/ykcs11/tests/ykcs11_tests_util.c	2022-03-08 13:37:03.828285732 -0500
+@@ -1039,6 +1039,7 @@
+ 
+       // External verification
+       if(evp != NULL) {
++        hdata_len = 0;
+         asrt(get_digest(mech_type, data, sizeof(data), hdata, &hdata_len), CKR_OK, "GET DIGEST");
+         ctx = EVP_PKEY_CTX_new(evp, NULL);
+         asrt(ctx != NULL, 1, "EVP_KEY_CTX_new");