Prepare 2.5.1 release

wfrisch · Feb 12, 2024 · ce66268 · ce66268
1 parent 5b7f25c
commit ce66268
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml
@@ -10,7 +10,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 2.5.0
+      RELEASE_VERSION: 2.5.1
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
           - os: macos-latest-xlarge
             arch: arm
     env:
-      RELEASE_VERSION: 2.5.0
+      RELEASE_VERSION: 2.5.1
       SO_VERSION: 2
     steps:
       - name: Download source from job_1

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 2.5.0
+      RELEASE_VERSION: 2.5.1
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.0
+      RELEASE_VERSION: 2.5.1
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1
@@ -95,7 +95,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.0
+      RELEASE_VERSION: 2.5.1
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ project (yubico-piv-tool)
 
 set (yubico_piv_tool_VERSION_MAJOR 2)
 set (yubico_piv_tool_VERSION_MINOR 5)
-set (yubico_piv_tool_VERSION_PATCH 0)
+set (yubico_piv_tool_VERSION_PATCH 1)
 set (VERSION "${yubico_piv_tool_VERSION_MAJOR}.${yubico_piv_tool_VERSION_MINOR}.${yubico_piv_tool_VERSION_PATCH}")
 set (SO_VERSION 2)
 

diff --git a/NEWS b/NEWS
@@ -1,5 +1,9 @@
 yubico-piv-tool NEWS -- History of user-visible changes.        -*- outline -*-
 
+* Version 2.5.1 (released 2024-02-14)
+
+** ykpiv: cmd: ykcs11: Fix buffer size for key import.
+
 * Version 2.5.0 (released 2024-01-31)
 
 ** ykpiv: cmd: ykcs11: Various changes and improvements.

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+yubico-piv-tool (2.5.1) stable; urgency=medium
+
+  * ykpiv: cmd: ykcs11: Fix buffer size for key import.
+
+ -- Aveen Ismail <[email protected]>  Wed, 14 Feb 2024 13:08:31 +0100
+
 yubico-piv-tool (2.5.0) stable; urgency=medium
 
   * ykpiv: cmd: ykcs11: Add support for RSA3072 and RSA4096 key types. Available in firmware 5.7.0 and newer

diff --git a/resources/macos/make_release_binaries.sh b/resources/macos/make_release_binaries.sh
@@ -75,13 +75,13 @@ install_name_tool -change $BREW_LIB/openssl@3/lib/libcrypto.3.dylib @loader_path
 install_name_tool -change $BREW_LIB/openssl@3/lib/libcrypto.3.dylib @loader_path/../lib/libcrypto.3.dylib $FINAL_INSTALL_DIR/lib/libykcs11.$VERSION.dylib
 install_name_tool -change $BREW_LIB/openssl@3/lib/libcrypto.3.dylib @loader_path/../lib/libcrypto.3.dylib $FINAL_INSTALL_DIR/bin/yubico-piv-tool
 
-install_name_tool -change $BREW_LIB/zlib/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/lib/libykpiv.$VERSION.dylib
-install_name_tool -change $BREW_LIB/zlib/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/lib/libykcs11.$VERSION.dylib
-install_name_tool -change $BREW_LIB/zlib/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/bin/yubico-piv-tool
+install_name_tool -change /usr/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/lib/libykcs11.$VERSION.dylib
+install_name_tool -change /usr/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/lib/libykpiv.$VERSION.dylib
+install_name_tool -change /usr/lib/libz.1.dylib @loader_path/../lib/libz.1.dylib $FINAL_INSTALL_DIR/bin/yubico-piv-tool
 
-install_name_tool -rpath "$FINAL_INSTALL_DIR/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/lib/libykpiv.$VERSION.dylib"
-install_name_tool -rpath "$FINAL_INSTALL_DIR/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/lib/libykcs11.$VERSION.dylib"
-install_name_tool -rpath "$FINAL_INSTALL_DIR/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/bin/yubico-piv-tool"
+install_name_tool -rpath "/usr/local/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/lib/libykcs11.$VERSION.dylib"
+install_name_tool -rpath "/usr/local/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/lib/libykpiv.$VERSION.dylib"
+install_name_tool -rpath "/usr/local/lib" "@loader_path/../lib" "$FINAL_INSTALL_DIR/bin/yubico-piv-tool"
 
 if otool -L $FINAL_INSTALL_DIR/lib/*.dylib $FINAL_INSTALL_DIR/bin/* | grep '$FINAL_INSTALL_DIR' | grep -q compatibility; then
 	echo "something is incorrectly linked!";

diff --git a/resources/win/yubico-piv-tool_x64.wxs b/resources/win/yubico-piv-tool_x64.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.0" ?>
+  <?define ProductVersion="2.5.1" ?>
   <?define ProductName="Yubico PIV Tool (x64)" ?>
 
    <Product Id="*" UpgradeCode="e4f980c4-5dd5-4d39-95b7-c6362ae65be8" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">

diff --git a/resources/win/yubico-piv-tool_x86.wxs b/resources/win/yubico-piv-tool_x86.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.0" ?>
+  <?define ProductVersion="2.5.1" ?>
   <?define ProductName="Yubico PIV Tool (x86)" ?>
 
    <Product Id="*" UpgradeCode="1aa2f085-add9-4556-9e21-299b078e6273" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">