Merge branch 'RM-4105-2' into 'master'

RM-4105: use slot parameter also with keyserver properties

See merge request cdoc2/cdoc2-java-ref-impl!108

Author: taistotr

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocDecryptCmd.java

@@ -76,7 +76,7 @@ public Void call() throws Exception {
 
         KeyCapsuleClientFactory keyCapsulesClientFactory = null;
         if (this.keyServerPropertiesFile != null) {
-            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile);
+            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile, slot);
         }
 
         DecryptionKeyMaterial decryptionKeyMaterial = (null == this.exclusive)

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocListCmd.java

@@ -66,7 +66,7 @@ public Void call() throws Exception {
 
         KeyCapsuleClientFactory keyCapsulesClientFactory = null;
         if (keyServerPropertiesFile != null) {
-            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile);
+            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile, slot);
         }
 
         DecryptionKeyMaterial decryptionKeyMaterial = (null == this.exclusive)

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocReEncryptCmd.java

@@ -104,7 +104,7 @@ public Void call() throws Exception {
         KeyCapsuleClientFactory keyCapsulesClientFactory = null;
 
         if (this.keyServerPropertiesFile != null) {
-            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile);
+            keyCapsulesClientFactory = getKeyCapsulesClientFactory(this.keyServerPropertiesFile, slot);
         }
 
         File destCdocFile = getDestinationFile();

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/util/CDocDecryptionHelper.java

@@ -155,10 +155,10 @@ public static CDocDecrypter getDecrypterWithFilesExtraction(
     }
 
     public static KeyCapsuleClientFactory getKeyCapsulesClientFactory(
-        String keyServerPropertiesFile
-    ) throws GeneralSecurityException, IOException {
+        String keyServerPropertiesFile,
+        Integer slot) throws GeneralSecurityException, IOException {
         Properties p = CDocCommonHelper.getServerProperties(keyServerPropertiesFile);
-
+        p.setProperty("pkcs11.slot", slot.toString());
         return KeyCapsuleClientImpl.createFactory(p);
     }
 

cdoc2-lib/src/main/java/ee/cyber/cdoc2/client/KeyCapsuleClientImpl.java

@@ -20,6 +20,8 @@
 import java.util.Optional;
 import java.util.Properties;
 import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,8 +175,9 @@ private static KeyStore loadClientKeyStore(Properties p) throws KeyStoreExceptio
             String openScLibPath = loadPkcs11LibPath(p);
             KeyStore.ProtectionParameter protectionParameter = loadClientKeyStoreProtectionParameter(p);
 
-            // default slot 0 - Isikutuvastus
-            clientKeyStore = Pkcs11Tools.initPKCS11KeysStore(openScLibPath, null, protectionParameter);
+            String slotProperty = p.getProperty("pkcs11.slot");
+            Integer slot = NumberUtils.isCreatable(slotProperty) ? Integer.parseInt(slotProperty) : 0;
+            clientKeyStore = Pkcs11Tools.initPKCS11KeysStore(openScLibPath, slot, protectionParameter);
         } else {
             throw new IllegalArgumentException("cdoc2.client.ssl.client-store.type " + type + " not supported");
         }