1 files changed, 22 insertions, 23 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
index c91f11444..d5f01a4cc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
@@ -41,6 +41,7 @@ import eu.stork.peps.auth.engine.X509PrincipalUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.NotImplementedException;
 import org.bouncycastle.jce.X509Principal;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.opensaml.Configuration;
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.SignableSAMLObject;
@@ -166,25 +167,25 @@ public final class SignP12 implements SAMLEngineSignI {
 		properties = new Properties();
 		try {
 			try {
-				LOG.debug("Fichero a cargar " + fileConf);
+				LOG.debug("Loading " + fileConf);
 				fileProperties = new FileInputStream(fileConf);
 				properties.loadFromXML(fileProperties);
 			} catch (Exception e) {
-				LOG.error("Fallo al cargar el recurso externo. Se reintenta como fichero interno.");
+				LOG.error("Failed to load external resource. Retrieving internal file.");
 				fileProperties = SignP12.class.getResourceAsStream("/" + fileConf);
 				if (fileProperties == null) {
 					fileProperties = Thread.currentThread().getContextClassLoader().getResourceAsStream(fileConf);
 					if (fileProperties == null) {
 						Enumeration<URL> files = ClassLoader.getSystemClassLoader().getResources(fileConf);
 						if (files != null && files.hasMoreElements()) {
-							LOG.info("Se han encontrado recurso/s. Se toma el primero.");
+							LOG.info("Found /s.");
 							fileProperties = ClassLoader.getSystemClassLoader().getResourceAsStream(files.nextElement().getFile());
 						} else {
-							throw new IOException("No se pudo recuperar el fichero: " + fileConf, e);
+							throw new IOException("Could not load file: " + fileConf, e);
 						}
 					}
 				}
-				LOG.debug("Recuperados " + fileProperties.available() + " bytes");
+				LOG.debug("Recovered " + fileProperties.available() + " bytes");
 				properties.loadFromXML(fileProperties);
 			}
 		} catch (InvalidPropertiesFormatException e) {
@@ -243,7 +244,7 @@ public final class SignP12 implements SAMLEngineSignI {
 				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
 				X509Principal issuerDNConf = new X509Principal(issuer);
 
-				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
+				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
 					alias = aliasCert;
 					find = true;
 				}
@@ -455,23 +456,21 @@ public final class SignP12 implements SAMLEngineSignI {
 		FileInputStream fisTrustStore = null;
 
 		try {
-			// // Dynamically register Bouncy Castle provider.
-			// boolean found = false;
-			// // Check if BouncyCastle is already registered as a provider
-			// final Provider[] providers = Security.getProviders();
-			// for (int i = 0; i < providers.length; i++) {
-			// if (providers[i].getName().equals(
-			// BouncyCastleProvider.PROVIDER_NAME)) {
-			// found = true;
-			// }
-			// }
-			//
-			// // Register only if the provider has not been previously registered
-			// if (!found) {
-			// LOG.debug("SAMLCore: Register Bouncy Castle provider.");
-			// Security.insertProviderAt(new BouncyCastleProvider(), Security
-			// .getProviders().length);
-			// }
+			// Dynamically register Bouncy Castle provider.
+			boolean found = false;
+			// Check if BouncyCastle is already registered as a provider
+			final Provider[] providers = Security.getProviders();
+			for (int i = 0; i < providers.length; i++) {
+				if (providers[i].getName().equals(BouncyCastleProvider.PROVIDER_NAME)) {
+					found = true;
+				}
+			}
+
+			// Register only if the provider has not been previously registered
+			if (!found) {
+				LOG.debug("SAMLCore: Register Bouncy Castle provider.");
+				Security.insertProviderAt(new BouncyCastleProvider(), Security.getProviders().length);
+			}
 
 			p12Store = KeyStore.getInstance(properties.getProperty("keystoreType"));