Adding metadata

8 files changed, 62 insertions, 797 deletions

diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 6db02b989c0d..cd1921ec4c2c 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,2 +1,2 @@
+DIST softhsm-2.6.1-patches.tar.xz 7460 BLAKE2B e9c5496ff1a79121ab62e77ab6541a1678d4254395622aaf76c4b8fdcabbd6144caba5c171e28744ae181169826d2523c9ddf73859ca9ca6bb7a5fdf36a8ea8e SHA512 35330e969d7de532f3b6a0821dc5faa40726dcdd9c62f5e78d05cfec1c35057e183dba0ed638388f3d0ad1bd536b4fbb3cc1ff060e133109cee9681c8ac48052
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
-DIST softhsm-2.7.0.tar.gz 564143 BLAKE2B a7c1234ddf6008dd8131440f7dd6437943dcdab93e3bc51770f366c60a025aba6df2e61409aea2e75003db7412216a68180013cdaeba71909c82e28554cd9e58 SHA512 8f24d513cbc4bebe9e244dc1231409cd42ee38de3e1ad72f98e74231a5efdeb0bd9b08197ba7885318bc3d44ebd4c7afb36ca2e236875031147fba118278f277
diff --git a/dev-libs/softhsm/files/OSSLECDSA.patch b/dev-libs/softhsm/files/OSSLECDSA.patch
deleted file mode 100644
index 0aed44c48da9..000000000000
--- a/dev-libs/softhsm/files/OSSLECDSA.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN softhsm-2.6.1.orig/src/lib/crypto/OSSLComp.cpp softhsm-2.6.1/src/lib/crypto/OSSLComp.cpp
---- softhsm-2.6.1.orig/src/lib/crypto/OSSLComp.cpp	2022-03-27 20:10:10.598249243 +0200
-+++ softhsm-2.6.1/src/lib/crypto/OSSLComp.cpp	2022-03-27 20:15:24.184271829 +0200
-@@ -34,7 +34,7 @@
- #include "OSSLComp.h"
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 
- /*
-  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/dev-libs/softhsm/files/botan.patch b/dev-libs/softhsm/files/botan.patch
deleted file mode 100644
index fc30bc7fa354..000000000000
--- a/dev-libs/softhsm/files/botan.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff '--color=auto' -urN SoftHSMv2-2.7.0.orig/src/lib/crypto/CMakeLists.txt SoftHSMv2-2.7.0/src/lib/crypto/CMakeLists.txt
---- SoftHSMv2-2.7.0.orig/src/lib/crypto/CMakeLists.txt	2026-01-22 22:25:49.483198662 +0100
-+++ SoftHSMv2-2.7.0/src/lib/crypto/CMakeLists.txt	2026-01-22 22:26:30.619448692 +0100
-@@ -136,12 +136,6 @@
- 	list(APPEND INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../win32)
- ENDIF()
- 
--if(WITH_BOTAN)
--	# mute botan specific warnings
--	# https://github.com/randombit/botan/issues/486
--	list(APPEND COMPILE_OPTIONS "/wd4250;/wd4251;/wd4275;/wd4127;/wd4273") 
--endif()
--
- include_directories(${INCLUDE_DIRS})
- add_library(${PROJECT_NAME} OBJECT ${SOURCES})
- target_compile_options(${PROJECT_NAME} PRIVATE ${COMPILE_OPTIONS})
diff --git a/dev-libs/softhsm/files/softhsm-2.6.1-prevent-global-deleted-objects-access.patch b/dev-libs/softhsm/files/softhsm-2.6.1-prevent-global-deleted-objects-access.patch
deleted file mode 100644
index 1062bf70276c..000000000000
--- a/dev-libs/softhsm/files/softhsm-2.6.1-prevent-global-deleted-objects-access.patch
+++ /dev/null
@@ -1,662 +0,0 @@
-from https://github.com/Emantor/SoftHSMv2/tree/fix/openssl3
-as discussed at https://github.com/opendnssec/SoftHSMv2/issues/729
-
-From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@openssl.org>
-Date: Fri, 27 Oct 2023 14:57:37 -0400
-Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted
-
-Fixes (Maybe) #729.
-Reset objects_deleted after reset is called.
---- a/src/lib/SoftHSM.cpp
-+++ b/src/lib/SoftHSM.cpp
-@@ -89,6 +89,8 @@
- 
- // Initialise the one-and-only instance
- 
-+int objects_deleted = 0;
-+
- #ifdef HAVE_CXX11
- 
- std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
-@@ -406,6 +408,8 @@ void SoftHSM::reset()
- {
- 	if (instance.get())
- 		instance.reset();
-+
-+	objects_deleted = 0;
- }
- 
- // Constructor
-@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
- 
- 	isInitialised = false;
- 
-+	objects_deleted = 1;
- 	resetMutexFactoryCallbacks();
- }
- 
---- a/src/lib/main.cpp
-+++ b/src/lib/main.cpp
-@@ -49,6 +49,8 @@
- #define PKCS_API
- #endif
- 
-+extern int objects_deleted;
-+
- // PKCS #11 function list
- static CK_FUNCTION_LIST functionList =
- {
-@@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Initialize(pInitArgs);
- 	}
- 	catch (...)
-@@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Finalize(pReserved);
- 	}
- 	catch (...)
-@@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetInfo(pInfo);
- 	}
- 	catch (...)
-@@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD;
- 
- 		*ppFunctionList = &functionList;
-@@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount);
- 	}
- 	catch (...)
-@@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo);
- 	}
- 	catch (...)
-@@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo);
- 	}
- 	catch (...)
-@@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount);
- 	}
- 	catch (...)
-@@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo);
- 	}
- 	catch (...)
-@@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel);
- 	}
- 	catch (...)
-@@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen);
- 	}
- 	catch (...)
-@@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
- 	}
- 	catch (...)
-@@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession);
- 	}
- 	catch (...)
-@@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_CloseSession(hSession);
- 	}
- 	catch (...)
-@@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_CloseAllSessions(slotID);
- 	}
- 	catch (...)
-@@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo);
- 	}
- 	catch (...)
-@@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen);
- 	}
- 	catch (...)
-@@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
- 	}
- 	catch (...)
-@@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen);
- 	}
- 	catch (...)
-@@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Logout(hSession);
- 	}
- 	catch (...)
-@@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject);
- 	}
- 	catch (...)
-@@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject);
- 	}
- 	catch (...)
-@@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DestroyObject(hSession, hObject);
- 	}
- 	catch (...)
-@@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize);
- 	}
- 	catch (...)
-@@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount);
- 	}
- 	catch (...)
-@@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount);
- 	}
- 	catch (...)
-@@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount);
- 	}
- 	catch (...)
-@@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount);
- 	}
- 	catch (...)
-@@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_FindObjectsFinal(hSession);
- 	}
- 	catch (...)
-@@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject);
- 	}
- 	catch (...)
-@@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
- 	}
- 	catch (...)
-@@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
- 	}
- 	catch (...)
-@@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen);
- 	}
- 	catch (...)
-@@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject);
- 	}
- 	catch (...)
-@@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData,
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
- 	}
- 	catch (...)
-@@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen);
- 	}
- 	catch (...)
-@@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen);
- 	}
- 	catch (...)
-@@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DigestInit(hSession, pMechanism);
- 	}
- 	catch (...)
-@@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen);
- 	}
- 	catch (...)
-@@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen);
- 	}
- 	catch (...)
-@@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DigestKey(hSession, hObject);
- 	}
- 	catch (...)
-@@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen);
- 	}
- 	catch (...)
-@@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey);
- 	}
- 	catch (...)
-@@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
- 	}
- 	catch (...)
-@@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen);
- 	}
- 	catch (...)
-@@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen);
- 	}
- 	catch (...)
-@@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey);
- 	}
- 	catch (...)
-@@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
- 	}
- 	catch (...)
-@@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey);
- 	}
- 	catch (...)
-@@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
- 	}
- 	catch (...)
-@@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen);
- 	}
- 	catch (...)
-@@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen);
- 	}
- 	catch (...)
-@@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey);
- 	}
- 	catch (...)
-@@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen);
- 	}
- 	catch (...)
-@@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
- 	}
- 	catch (...)
-@@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen);
- 	}
- 	catch (...)
-@@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
- 	}
- 	catch (...)
-@@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
- 	}
- 	catch (...)
-@@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey);
- 	}
- 	catch (...)
-@@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
- 	}
- 	catch (...)
-@@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
- 	}
- 	catch (...)
-@@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey);
- 	}
- 	catch (...)
-@@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey);
- 	}
- 	catch (...)
-@@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen);
- 	}
- 	catch (...)
-@@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen);
- 	}
- 	catch (...)
-@@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_GetFunctionStatus(hSession);
- 	}
- 	catch (...)
-@@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession)
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_CancelFunction(hSession);
- 	}
- 	catch (...)
-@@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_
- {
- 	try
- 	{
-+		if (objects_deleted == 1)
-+			return CKR_FUNCTION_FAILED;
- 		return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved);
- 	}
- 	catch (...)
-
diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 68943e1dcea5..54918dfeae5b 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
   <use>
     <flag name="gost">Enable gost algorithm</flag>
     <flag name="migration-tool">Build db migration tool</flag>
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
deleted file mode 100644
index 651230d0e995..000000000000
--- a/dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist gost migration-tool test"
-RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
-	dev-libs/openssl:=
-	? ( dev-libs/botan:2 )
-	!~dev-libs/softhsm-2.0.0:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
-
-DOCS=(
-	NEWS
-	README.md
-)
-
-PATCHES="${FILESDIR}/OSSLECDSA.patch"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
-		$(use_enable !bindist ecc) \
-		$(use_enable gost) \
-		$(use_with migration-tool migrate)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
-}
diff --git a/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild
new file mode 100644
index 000000000000..efbfc7e4b95b
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.6.1-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.6.1-patches.tar.xz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="gost migration-tool test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	migration-tool? ( dev-db/sqlite:3= )
+	dev-libs/openssl:=
+	!~dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gcc:=[cxx]
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
+
+DOCS=( NEWS README.md )
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-onexit.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-openssl3-tests.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-uninitialised.patch
+	"${WORKDIR}"/${PN}-2.6.1-patches/${PN}-2.6.1-prevent-global-deleted-objects-access.patch
+)
+
+src_configure() {
+	# Test failures with LTO (bug #867637)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	econf \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-ecc \
+		$(use_enable gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /var/lib/softhsm/tokens
+}
diff --git a/dev-libs/softhsm/softhsm-2.7.0.ebuild b/dev-libs/softhsm/softhsm-2.7.0.ebuild
deleted file mode 100644
index c200942671b1..000000000000
--- a/dev-libs/softhsm/softhsm-2.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2021-2026 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist gost migration-tool test"
-RESTRICT="!test? ( test )"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="migration-tool? ( dev-db/sqlite:3= )
-	dev-libs/openssl:=
-	? ( dev-libs/botan-2 )
-	!~dev-libs/softhsm-2.0.0:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gcc:=[cxx]
-	test? ( dev-util/cppunit )"
-
-DOCS=(
-	NEWS
-	README.md
-)
-S=${WORKDIR}/SoftHSMv2-${PV}
-
-PATCHES="${FILESDIR}/OSSLECDSA.patch"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-crypto-backend=openssl \
-		--disable-p11-kit \
-		--localstatedir="${EROOT}/var" \
-		$(use_enable !bindist ecc) \
-		$(use_enable gost) \
-		$(use_with migration-tool migrate)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir "${EROOT}/var/lib/softhsm/tokens"
-}