aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-saml-engine/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-01-23 12:00:38 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-01-23 12:00:38 +0100
commit2195b00332cc6cba95f9ebec67dfdb230ee600f8 (patch)
tree66087939c3921bf3015131f55941791e02622161 /id/server/stork2-saml-engine/src
parent38ae8cb883ab73603f490d62b4cac38c51ac43e1 (diff)
parentd6637f8e82b41936b962f2197dee8cf89d0fe0b9 (diff)
downloadmoa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.tar.gz
moa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.tar.bz2
moa-id-spss-2195b00332cc6cba95f9ebec67dfdb230ee600f8.zip
Merge STORK2 code into development branch
Diffstat (limited to 'id/server/stork2-saml-engine/src')
-rw-r--r--id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java18
1 files changed, 11 insertions, 7 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
index d415375e7..0984bb9ca 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
@@ -220,13 +220,17 @@ public class SignSW implements SAMLEngineSignI {
final String serialNum = certificate.getSerialNumber()
.toString(16);
- X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
- X509Principal issuerDNConf = new X509Principal(issuer);
-
- if (serialNum.equalsIgnoreCase(serialNumber)
- && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
- alias = aliasCert;
- find = true;
+ try {
+ X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
+ X509Principal issuerDNConf = new X509Principal(issuer);
+
+ if (serialNum.equalsIgnoreCase(serialNumber)
+ && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
+ alias = aliasCert;
+ find = true;
+ }
+ } catch (Exception ex) {
+ LOG.error("Exception during signing: " + ex.getMessage()); // Added as a workaround for Bouncycastle email error
}
}
if (!find) {