From 22a66cdf1b5f7916422034f3338e680202ddc31b Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 31 Oct 2014 17:35:35 +0100
Subject: phypersom

---
 id/server/stork2-saml-engine/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'id/server/stork2-saml-engine')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 30f2bff7c..1979c770e 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -17,7 +17,7 @@
 		<samlspec.version>0.5.2</samlspec.version>
 		<samlspecacept.version>0.5.1</samlspecacept.version>
 		<commons.version>1.4.0</commons.version>
-		<opensaml.version>2.6.2</opensaml.version>
+		<opensaml.version>2.6.0</opensaml.version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
@@ -89,6 +89,12 @@
 			</exclusions>
 		</dependency>
 
+        <!--
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>xmltooling</artifactId>
+        </dependency>
+        -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-- 
cgit v1.2.3


From b557ff02ff830682bfe1a1049cfad72e3d9a11e0 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Thu, 6 Nov 2014 15:28:31 +0100
Subject: Revert "Merge branch 'moa-2.1-Snapshot' of
 gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot"

This reverts commit 775e39a724baf237085280510216fbd688df6dd9, reversing
changes made to 1fbff5f5a86733bc6a75c8ae901153baa0963441.
---
 id/server/stork2-saml-engine/pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'id/server/stork2-saml-engine')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 1979c770e..30f2bff7c 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -17,7 +17,7 @@
 		<samlspec.version>0.5.2</samlspec.version>
 		<samlspecacept.version>0.5.1</samlspecacept.version>
 		<commons.version>1.4.0</commons.version>
-		<opensaml.version>2.6.0</opensaml.version>
+		<opensaml.version>2.6.2</opensaml.version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
@@ -89,12 +89,6 @@
 			</exclusions>
 		</dependency>
 
-        <!--
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>xmltooling</artifactId>
-        </dependency>
-        -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-- 
cgit v1.2.3


From c6985f25c723291af7e4637862a1567c4db2d59c Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 7 Nov 2014 14:43:30 +0100
Subject: adding xmltooling due to error

---
 id/server/stork2-saml-engine/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/server/stork2-saml-engine')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 30f2bff7c..a89abf70f 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -89,6 +89,12 @@
 			</exclusions>
 		</dependency>
 
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>xmltooling</artifactId>
+            <version>1.4.3</version>
+        </dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-- 
cgit v1.2.3


From f5d8d620a8a9ed8dda131cbcce5da934b8351c23 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 7 Nov 2014 15:21:46 +0100
Subject: update stork2-samlengine

---
 id/server/stork2-saml-engine/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/stork2-saml-engine')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index a89abf70f..a082a618b 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>org.opensaml</groupId>
 			<artifactId>opensaml</artifactId>
-<!-- 			<version>${opensaml.version}</version> -->
+			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
-- 
cgit v1.2.3


From d6637f8e82b41936b962f2197dee8cf89d0fe0b9 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Thu, 4 Dec 2014 15:10:37 +0100
Subject: health attributes update and bouncycastle bug workaround

---
 .../eu/stork/peps/auth/engine/core/impl/SignSW.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'id/server/stork2-saml-engine')

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) {
-- 
cgit v1.2.3