1 files changed, 19 insertions, 1 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
index 6d81700a..1611d623 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
@@ -46,6 +46,7 @@ public class EaafKeyStoreX509CredentialAdapter extends KeyStoreX509CredentialAda
     implements EaafX509Credential {
 
   private String signatureAlgorithmtToUse;
+  private String keyEncryptionAlgorithmtToUse;
 
   /**
    * Get an OpenSAML2 keystore.
@@ -72,10 +73,15 @@ public class EaafKeyStoreX509CredentialAdapter extends KeyStoreX509CredentialAda
     }
 
     try {
-      setSignatureAlgorithmForSigning(Saml2Utils.getSignatureAlgorithm(this,
+      setSignatureAlgorithmForSigning(Saml2Utils.getKeyOperationAlgorithmFromCredential(this,
           PvpConstants.DEFAULT_SIGNING_METHODE_RSA,
           PvpConstants.DEFAULT_SIGNING_METHODE_EC));
 
+      setKeyEncryptionAlgorithmForDataEncryption(
+          Saml2Utils.getKeyOperationAlgorithmFromCredential(this,
+          PvpConstants.DEFAULT_ASYM_ENCRYPTION_METHODE_RSA,
+          PvpConstants.DEFAULT_ASYM_ENCRYPTION_METHODE_EC));
+
     } catch (final SamlSigningException e) {
       throw new CredentialsNotAvailableException("internal.pvp.01", new Object[] { keyStoreFriendlyName,
           alias }, e);
@@ -101,4 +107,16 @@ public class EaafKeyStoreX509CredentialAdapter extends KeyStoreX509CredentialAda
 
   }
 
+  @Override
+  public String getKeyEncryptionAlgorithmForDataEncryption() {
+    return this.keyEncryptionAlgorithmtToUse;
+
+  }
+
+  @Override
+  public void setKeyEncryptionAlgorithmForDataEncryption(String sigAlg) {
+    this.keyEncryptionAlgorithmtToUse = sigAlg;
+
+  }
+
 }