From 1ab0f1d4d991464b906c34befefe2ecaf485d485 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 19 Aug 2014 15:03:42 +0200
Subject: add interfederation without attributequery request which use
 encrypted bPKs  (this functionality is required for federation with USP)

---
 .../src/main/resources/config/moaid_config_2.0.xsd | 28 +++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/src')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 066967b44..f2f1949cc 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -551,6 +551,7 @@
 						<xsd:element ref="OA_SAML1" minOccurs="0"/>
 						<xsd:element ref="OA_PVP2" minOccurs="0"/>
 						<xsd:element ref="OA_OAUTH20" minOccurs="0"/>
+						<xsd:element ref="EncBPKInformation" minOccurs="0" maxOccurs="1"/>
 					</xsd:sequence>
 					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" 
 						maxOccurs="1"/ -->
@@ -558,6 +559,31 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
+	<xsd:element name="EncBPKInformation">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="bPKDecryption" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="keyInformation" type="xsd:base64Binary" minOccurs="1" maxOccurs="1"/>
+							<xsd:element name="iv" type="xsd:base64Binary" minOccurs="1" maxOccurs="1"/>
+							<xsd:element name="keyStoreFileName" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+							<xsd:element name="keyAlias" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="bPKEncryption" minOccurs="0" maxOccurs="unbounded">
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="publicKey" type="xsd:base64Binary" minOccurs="1" maxOccurs="1"/>
+							<xsd:element name="target" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+							<xsd:element name="vkz" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>		
+		</xsd:complexType>
+	</xsd:element>
 	<xsd:complexType name="ConnectionParameterServerAuthType">
 		<xsd:sequence>
 			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">
@@ -827,7 +853,7 @@
 			</xsd:sequence>
 			<xsd:attribute name="countryCode" type="CountryCodeType" use="required"/>
 			<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
-			<xsd:attribute name="supportsXMLSignature" type="xsd:boolean" default="true"></xsd:attribute>
+			<xsd:attribute name="supportsXMLSignature" type="xsd:boolean" default="true"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="STORK">
-- 
cgit v1.2.3


From 5df1984c62b3f214ce9ed368beb9473bce0183e5 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 21 Aug 2014 12:09:00 +0200
Subject: fix some problems with Single LogOut

---
 .../java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/src')

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index e890e2145..848f4ee07 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -65,7 +65,7 @@ public class ConfigurationDBRead {
 
         List result;
         EntityManager session = ConfigurationDBUtils.getCurrentSession();
-
+        
         javax.persistence.Query query = session.createQuery(QUERIES.get("getActiveOnlineApplicationWithID"));
         //query.setParameter("id", id+"%");
         query.setParameter("id", StringEscapeUtils.escapeHtml(id));
-- 
cgit v1.2.3