IS-74 Bugfix for PKCS11 providers (#75)

* IS-74 Bumped version/copyright * IS-74 Made sure that not multiple providers are created * Added release notes
swedenconnect · Jan 21, 2025 · d06e5f0 · d06e5f0
1 parent 01f976d
commit d06e5f0
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ Java libraries for PKI credentials support, including PKCS#11 and HSM:s.
 
     1.2. [Maven](#maven)
 
+    1.3. [Release Notes](#release-notes)
+
 2. [**Credential types**](#credential-types)
 
     2.1. [BasicCredential](#basiccredential)
@@ -183,6 +185,10 @@ The **credentials-support-spring-boot-starter** library:
 
 > Will include **opensaml-library** and **credentials-support-spring**.
 
+<a name="release-notes"></a>
+### 1.3. Release Notes
+
+See https://docs.swedenconnect.se/credentials-support/release-notes.html
 
 <a name="credential-types"></a>
 ## 2. Credential Types
@@ -997,4 +1003,4 @@ For further information consult the information at [hsm-support-scripts/key-gene
 
 ---
 
-Copyright &copy; 2020-2024, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+Copyright &copy; 2020-2025, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/credentials-support/pom.xml b/credentials-support/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: Base Library</name>

diff --git a/credentials-support/src/main/java/se/swedenconnect/security/credential/LibraryVersion.java b/credentials-support/src/main/java/se/swedenconnect/security/credential/LibraryVersion.java
@@ -24,7 +24,7 @@ public final class LibraryVersion {
 
   private static final int MAJOR = 2;
   private static final int MINOR = 0;
-  private static final int PATCH = 1;
+  private static final int PATCH = 2;
 
   /**
    * Global serialization value for classes.

diff --git a/...main/java/se/swedenconnect/security/credential/pkcs11/AbstractSunPkcs11Configuration.java b/...main/java/se/swedenconnect/security/credential/pkcs11/AbstractSunPkcs11Configuration.java
@@ -128,9 +128,12 @@ else if (this.getConfigurationData() == null) {
         //
         final int result = Security.addProvider(p);
         if (result == -1) {
-          log.warn("A provider with the name '{}' has already been installed", p.getName());
+          log.info("A provider with the name '{}' has already been installed, re-using it ...", p.getName());
+          this.provider = Security.getProvider(p.getName());
+        }
+        else {
+          this.provider = p;
         }
-        this.provider = p;
       }
     }
     return this.provider;

diff --git a/docs/index.md b/docs/index.md
@@ -16,6 +16,8 @@ Java libraries for PKI credentials support, including PKCS#11 and HSM:s.
 
     1.2. [Maven](#maven)
 
+    1.3. [Release Notes](#release-notes)
+
 2. [**Credential types**](#credential-types)
 
     2.1. [BasicCredential](#basiccredential)
@@ -183,6 +185,10 @@ The **credentials-support-spring-boot-starter** library:
 
 > Will include **opensaml-library** and **credentials-support-spring**.
 
+<a name="release-notes"></a>
+### 1.3. Release Notes
+
+See https://docs.swedenconnect.se/credentials-support/release-notes.html
 
 <a name="credential-types"></a>
 ## 2. Credential Types
@@ -997,4 +1003,4 @@ For further information consult the information at [hsm-support-scripts/key-gene
 
 ---
 
-Copyright &copy; 2020-2024, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+Copyright &copy; 2020-2025, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/docs/old-readme.md b/docs/old-readme.md
@@ -401,4 +401,4 @@ For further information consult the information at [hsm-support-scripts/key-gene
 
 ---
 
-Copyright &copy; 2020-2024, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+Copyright &copy; 2020-2025, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -0,0 +1,31 @@
+![Logo](https://docs.swedenconnect.se/technical-framework/img/sweden-connect.png)
+
+# credentials-support
+
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/se.swedenconnect.security/credentials-support/badge.svg)](https://maven-badges.herokuapp.com/maven-central/se.swedenconnect.security/credentials-support)
+
+---
+
+## Release Notes
+
+### 2.0.2
+
+**Date:** -
+
+- Fixed bug that occurred if the same PKCS#11 provider were used for several keys. See https://github.com/swedenconnect/credentials-support/issues/74.
+
+### 2.0.1
+
+**Date:** 2024-12-07
+
+- Moved Spring application events from the Spring Boot Starter to the Spring library to make them re-usable by other libraries.
+
+### 2.0.0
+
+**Date:** 2024-12-06
+
+- A completely new base with support for Spring Boot, OpenSAML, Nimbus.
+
+---
+
+Copyright &copy; 2020-2025, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/nimbus/pom.xml b/nimbus/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: Nimbus Library</name>

diff --git a/opensaml/pom.xml b/opensaml/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: OpenSAML Library</name>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>se.swedenconnect.security</groupId>
   <artifactId>credentials-support-parent</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Sweden Connect :: Credentials Support :: Parent</name>

diff --git a/softhsm/pom.xml b/softhsm/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>se.swedenconnect.security</groupId>
   <artifactId>credentials-support-test</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Sweden Connect :: PKI credentials support library (test)</name>

diff --git a/spring/credentials-support-spring-boot-starter/pom.xml b/spring/credentials-support-spring-boot-starter/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-spring-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: Spring Boot Starter</name>

diff --git a/spring/credentials-support-spring/pom.xml b/spring/credentials-support-spring/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-spring-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: Spring Library</name>

diff --git a/spring/pom.xml b/spring/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>se.swedenconnect.security</groupId>
     <artifactId>credentials-support-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <name>Sweden Connect :: Credentials Support :: Spring :: Parent</name>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -401,4 +401,4 @@ For further information consult the information at [hsm-support-scripts/key-gene

		---

		Copyright © 2020-2024, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
		Copyright © 2020-2025, [Sweden Connect](https://swedenconnect.se). Licensed under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).