Prepare 2.6.0 release

Yubico · Aug 8, 2024 · c409285 · c409285
1 parent 1466a1a
commit c409285
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 17 deletions.
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -1,6 +1,9 @@
 name: Run Integration Tests
 
-on: [push, pull_request]
+on:
+  schedule:
+    # Run this every wednesday at 3:40. https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
+    - cron: '40 3 * * 3'
 
 jobs:
   main:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      VERSION: 2.5.0
+      VERSION: 2.6.0
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
           - os: windows-latest
             arch: x64
     env:
-      VERSION: 2.5.0
+      VERSION: 2.6.0
     steps:
       - name: Download source from source job
         uses: actions/download-artifact@v4
@@ -96,7 +96,7 @@ jobs:
           - os: macos-latest-xlarge
             arch: arm
     env:
-      VERSION: 2.5.0
+      VERSION: 2.6.0
       SO_VERSION: 2
     steps:
       - name: Download source from source job

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,15 +1,21 @@
+=== Version 2.6.0
+
+lib: shell: pkcs11: Add support for asymmetric wrap
+pkcs11: Add support for PKCS11 3.0
+build: Always compile with YubiHSM Auth enabled
+
 === Version 2.5.0
 
-PKCS11: Add support for applying KDF after ECDH derivation
-PKCS11: Shell: Fix minor bugs
-Test: Increase test coverage
+pkcs11: Add support for applying KDF after ECDH derivation
+pkcs11: Shell: Fix minor bugs
+test: Increase test coverage
 
 === Version 2.4.2
 
-PKCS11: Add Symmetric key capabilities to searchable criteria
-PKCS11: Add support for CKA_KEY_TYPE when searching for objects
-PKCS11: Add support for CKA_MODIFIABLE and CKA_COPYABLE attributes for AES and Wrap keys
-Test: Increase test coverage
+pkcs11: Add Symmetric key capabilities to searchable criteria
+pkcs11: Add support for CKA_KEY_TYPE when searching for objects
+pkcs11: Add support for CKA_MODIFIABLE and CKA_COPYABLE attributes for AES and Wrap keys
+test: Increase test coverage
 
 === Version 2.4.1
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,7 +93,7 @@ else ()
 endif ()
 
 set (yubihsm_shell_VERSION_MAJOR 2)
-set (yubihsm_shell_VERSION_MINOR 5)
+set (yubihsm_shell_VERSION_MINOR 6)
 set (yubihsm_shell_VERSION_PATCH 0)
 set (VERSION "${yubihsm_shell_VERSION_MAJOR}.${yubihsm_shell_VERSION_MINOR}.${yubihsm_shell_VERSION_PATCH}")
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+yubihsm-shell (2.6.0) unstable; urgency=medium
+
+    * lib: shell: pkcs11: Add support for asymmetric wrap
+    * pkcs11: Add support for PKCS11 3.0
+    * build: Always compile with YubiHSM Auth enabled
+
+ -- Aveen Ismail <[email protected]>  Thu, 8 Aug 2024 16:08:45 +0100
+
 yubihsm-shell (2.5.0) unstable; urgency=medium
 
 	* pkcs11: Add support for applying KDF after ECDH derivation

diff --git a/resources/release/linux/yubihsm-shell.spec b/resources/release/linux/yubihsm-shell.spec
@@ -1,7 +1,7 @@
 %global _yubihsm yubihsm
 
 Name:		yubihsm-shell
-Version:	2.5.0
+Version:	2.6.0
 Release:	1%{?dist}
 Summary:	Tools to interact with YubiHSM 2
 
@@ -78,5 +78,5 @@ install -m 0644 ../LICENSE %{buildroot}/%{_prefix}/share/licenses/%{name}
 
 
 %changelog
-* Wed Mar 27 2024 Aveen Ismail <[email protected]> - 2.5.0
-- Releasing version 2.5.0
+* Wed Mar 27 2024 Aveen Ismail <[email protected]> - 2.6.0
+- Releasing version 2.6.0
diff --git a/resources/release/win/yubihsm-shell_x64.wxs b/resources/release/win/yubihsm-shell_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.6.0" ?>
   <?define ProductName="YubiHSM Shell (x64)" ?>
 
    <Product Id="*" UpgradeCode="af3c0c04-a974-4077-a29f-7651b546d770" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">

diff --git a/resources/release/win/yubihsm-shell_x86.wxs b/resources/release/win/yubihsm-shell_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.6.0" ?>
   <?define ProductName="YubHSM Shell (x86)" ?>
 
    <Product Id="*" UpgradeCode="41fa903d-bdde-4dee-84bd-6dcf71a37acd" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">