Merge pull request #16 from gematik/publishInternalRelease-15

Publish Release
gematik · Jan 24, 2024 · 6ecfe97 · 6ecfe97
2 parents 1043e2a + a9b881e
commit 6ecfe97
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+*.spp
+
 release.jenkinsfile
 validation.jenkinsfile
 gitHubPublish.jenkinsfile

diff --git a/consumer/CertificateService.wsdl b/consumer/CertificateService.wsdl
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version History
-            version: V1.0.0
-				initiale Version
-            version: V2.0.0
-				changed namespace CERT,CERTW
+		version: V1.0.0
+			initiale Version
+		version: V2.0.0
+			changed namespace CERT,CERTW
+		version: V3.0.0
+			C_11647: change namespace CERT,CERTW
 	 End of Version History-->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v2.0" xmlns:CERTW="http://ws.gematik.de/consumer/CertificateService/WSDL/v2.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/WSDL/v2.0">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.0" xmlns:CERTW="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0">
 	<documentation>
 		Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Zertifikatsdienst des Basis-Consumer
-		version=2.0.0
 	</documentation>
 	<types>
 		<xs:schema>
-			<xs:import schemaLocation="CertificateService.xsd" namespace="http://ws.gematik.de/consumer/CertificateService/v2.0"/>
+			<xs:import schemaLocation="CertificateService.xsd" namespace="http://ws.gematik.de/consumer/CertificateService/v3.0"/>
 			<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
 		</xs:schema>
 	</types>

diff --git a/consumer/CertificateService.xsd b/consumer/CertificateService.xsd
@@ -1,18 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Mit XMLSpy v2023 sp1 (x64) (http://www.altova.com) von n/a (Gematik) bearbeitet -->
 <!-- Version History
-            version: V1.0.0
+		version: V1.0.0
 			* initiale Version
-            version: V2.0.0
+		version: V2.0.0
 			* changed namespace CONSUMER, CERT, targetNameSpace
+		version: V3.0.0
+			* C_11647: add operation ReadCertificate
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v2.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/v3.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.0.0">
 	<annotation>
-		<documentation xml:lang="de">Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
-		Beschreibung: Schema fÃ¼r den Zertifikatsdienst des Basis-Consumer</documentation>
+		<documentation xml:lang="de">Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
+		Beschreibung: Schema für den Zertifikatsdienst des Basis-Consumer</documentation>
 	</annotation>
 	<import namespace="http://ws.gematik.de/tel/error/v2.0" schemaLocation="../tel/error/TelematikError.xsd"/>
 	<import namespace="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" schemaLocation="ConsumerCommon.xsd"/>
-	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" schemaLocation="CertificateServiceCommon.xsd"/>
+	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" schemaLocation="CertificateServiceCommon.xsd"/>
+	<!-- ================== Datentyp für krypt.Algorithmus    ===================== -->
+	<simpleType name="CryptType">
+		<restriction base="token">
+			<enumeration value="RSA"/>
+			<enumeration value="ECC"/>
+		</restriction>
+	</simpleType>
+	<!-- ================== Operation ReadCertificate     ===================== -->
+	<element name="ReadCertificate">
+		<annotation>
+			<documentation>Liest X.509-Zertifikate von einer Identitätsquelle.</documentation>
+		</annotation>
+		<complexType>
+			<sequence>
+				<element ref="CONSUMER:CardHandle"/>
+				<element name="CertRefList">
+					<complexType>
+						<sequence>
+							<element name="CertRef" maxOccurs="unbounded">
+								<simpleType>
+									<restriction base="CERTCMN:CertRefEnum"/>
+								</simpleType>
+							</element>
+						</sequence>
+					</complexType>
+				</element>
+				<element name="Crypt" type="CERT:CryptType" minOccurs="0"/>
+			</sequence>
+		</complexType>
+	</element>
+	<element name="ReadCertificateResponse">
+		<annotation>
+			<documentation>Antwort der Operation ReadCertificate. Enthält das gelesene Zertifikat.</documentation>
+		</annotation>
+		<complexType>
+			<sequence>
+				<element ref="CONSUMER:Status"/>
+				<element ref="CERTCMN:X509DataInfoList"/>
+			</sequence>
+		</complexType>
+	</element>
 	<!-- ================== Operation VerifyCertificate     ===================== -->
 	<element name="VerifyCertificate">
 		<annotation>
@@ -70,4 +114,4 @@
 			</sequence>
 		</complexType>
 	</element>
-</schema>
+</schema>
diff --git a/consumer/CertificateServiceCommon.xsd b/consumer/CertificateServiceCommon.xsd
@@ -2,16 +2,25 @@
 <!-- Version History            
 			version: V1.0.0
 				* initiale Version
+			version: V2.0.0
+				* add types for ReadCardCertificate Operation
+				* fix character encoding
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" targetNamespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
 	<annotation>
 		<documentation xml:lang="de">
-			Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH.
+			Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH.
 				Alle Rechte vorbehalten.
-			Beschreibung: Schema fÃ¼r gemeinsam nutzbare Elemente des Zertifikatsdienstes des Basis Consumer
+			Beschreibung: Schema für gemeinsam nutzbare Elemente des Zertifikatsdienstes des Consumer
 		</documentation>
 	</annotation>
-	<!-- ====== Definiert die reservierten Werte fÃ¼r Zertifikatsreferenzen ========= -->
+	<!-- ====== Definiert die reservierten Werte für Zertifikatsreferenzen ========= -->
+	<simpleType name="CertRefEnum">
+		<restriction base="token">
+			<enumeration value="C.AUT"/>
+		</restriction>
+	</simpleType>
+	<element name="X509DataInfoList" type="CERTCMN:X509DataInfoListType"/>
 	<simpleType name="CheckCertificateDetailEnum">
 		<restriction base="token">
 			<enumeration value="CERT_SIG_ERROR"/>
@@ -36,5 +45,32 @@
 		</sequence>
 	</complexType>
 	<element name="CheckCertificateDetails" type="CERTCMN:CheckCertificateDetailsType"/>
+	<complexType name="X509DataInfoListType">
+		<sequence>
+			<element name="X509DataInfo" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="CertRef" type="CERTCMN:CertRefEnum"/>
+						<element name="X509Data" minOccurs="0">
+							<complexType>
+								<sequence>
+									<element name="X509IssuerSerial">
+										<complexType>
+											<sequence>
+												<element name="X509IssuerName" type="string"/>
+												<element name="X509SerialNumber" type="string"/>
+											</sequence>
+										</complexType>
+									</element>
+									<element name="X509SubjectName" type="string"/>
+									<element ref="CERTCMN:X509Certificate"/>
+								</sequence>
+							</complexType>
+						</element>
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
 	<element name="X509Certificate" type="base64Binary"/>
 </schema>
diff --git a/consumer/EncryptionService.wsdl b/consumer/EncryptionService.wsdl
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version History
-            version: V1.0.0
+		version: V1.0.0
 			* initiale Version
-            version: V2.0.0
-				changed namespace CRYPT
+		version: V2.0.0
+			changed namespace CRYPT
+		version: V3.0.0
+			C_11647: change namespace CRYPT, CRYPTW
 	 End of Version History-->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v2.0" xmlns:CRYPTW="http://ws.gematik.de/consumer/EncryptionService/WSDL/v2.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" xmlns:ns="http://ws.gematik.de/consumer/EncryptionService/WSDL/v1.0" targetNamespace="http://ws.gematik.de/consumer/EncryptionService/WSDL/v2.0">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v3.0" xmlns:CRYPTW="http://ws.gematik.de/consumer/EncryptionService/WSDL/v3.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" xmlns:ns="http://ws.gematik.de/consumer/EncryptionService/WSDL/v3.0" targetNamespace="http://ws.gematik.de/consumer/EncryptionService/WSDL/v3.0">
 	<documentation>
 		Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Basis-Consumer Verschlüsselung Basisanwendung
-		Version=2.0.0
 </documentation>
 	<types>
 		<xs:schema>
-			<xs:import schemaLocation="EncryptionService.xsd" namespace="http://ws.gematik.de/consumer/EncryptionService/v2.0"/>
+			<xs:import schemaLocation="EncryptionService.xsd" namespace="http://ws.gematik.de/consumer/EncryptionService/v3.0"/>
 			<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
 		</xs:schema>
 	</types>

diff --git a/consumer/EncryptionService.xsd b/consumer/EncryptionService.xsd
@@ -6,12 +6,15 @@
 			version: V2.0.0
 				changed KeyOnCardType: KeyReference removed, Crypt added.
 				changed OptionalInputs: CRYPT:Element removed
+			version: V3.0.0
+				* C_11647: change namespace CRYPT
+				* fix charcter encoding
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v2.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" targetNamespace="http://ws.gematik.de/consumer/EncryptionService/v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" targetNamespace="http://ws.gematik.de/consumer/EncryptionService/v3.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.0.0">
 	<annotation>
 		<documentation xml:lang="de">
-			Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
-			Beschreibung: Schema-Beschreibung fÃ¼r die Encryption Basisanwendung des Basis-Consumer
+			Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
+			Beschreibung: Schema-Beschreibung für die Encryption Basisanwendung des Basis-Consumer
 		</documentation>
 	</annotation>
 	<import namespace="urn:oasis:names:tc:dss:1.0:core:schema" schemaLocation="../ext/oasis-dss-core-schema-v1.0-os.xsd"/>

diff --git a/consumer/SignatureService.wsdl b/consumer/SignatureService.wsdl
@@ -3,20 +3,22 @@
 <!-- 	                    Copyright (C) 2019 gematik. Alle Rechte vorbehalten.                                 -->
 <!-- ===================================================================== -->
 <!-- Version History            
-            version: V1.0.0
-				initial version
-            version: V2.0.0
-				changed nmaespace SIG	 
+		version: V1.0.0
+			initial version
+		version: V2.0.0
+			changed nmaespace SIG
+		version: V3.0.0
+			change namespace SIG
+			fix character encoding
 	 End of Version History-->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v2.0" xmlns:SIGW="http://ws.gematik.de/consumer/SignatureService/WSDL/v2.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/WSDL/v2.0">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.0" xmlns:SIGW="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.0">
 	<documentation>
-		Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
+		Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Basis-Consumer Signatur Basisanwendung
-		version=2.0.0 
 	</documentation>
 	<types>
 		<xs:schema>
-			<xs:import schemaLocation="SignatureService.xsd" namespace="http://ws.gematik.de/consumer/SignatureService/v2.0"/>
+			<xs:import schemaLocation="SignatureService.xsd" namespace="http://ws.gematik.de/consumer/SignatureService/v3.0"/>
 			<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
 		</xs:schema>
 	</types>

diff --git a/consumer/SignatureService.xsd b/consumer/SignatureService.xsd
@@ -15,21 +15,23 @@
 				changed VerifyDocumentResponse:OptionalOutputs:	DocumentWithSignature removed
 																UpdatedSignature removed
 				changed namespace SIG, targetNameSpace
+			version: V3.0.0
+				* C_11647: extend ExternalAuthenticate Operation for "ePA für alle"
+				* fix character encoding
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:vr="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v2.0" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v2.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:sp="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:vr="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.0" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:sp="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/v3.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.0.0">
 	<annotation>
 		<documentation xml:lang="de">
-			Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten. 
-			Beschreibung: Schema fÃ¼r den Signaturdienst des Basis-Consumer
-			Version: 1.0.0
+			Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten. 
+			Beschreibung: Schema für den Signaturdienst des Basis-Consumer
 		</documentation>
 	</annotation>
 	<import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../ext/xmldsig-core-schema.xsd"/>
 	<import namespace="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" schemaLocation="../ext/oasis-dssx-1.0-profiles-sigpolicy-schema-cd01.xsd"/>
 	<import namespace="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" schemaLocation="../ext/oasis-dssx-1.0-profiles-vr-cd1.xsd"/>
 	<import namespace="urn:oasis:names:tc:dss:1.0:core:schema" schemaLocation="../ext/oasis-dss-core-schema-v1.0-os.xsd"/>
-	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" schemaLocation="CertificateServiceCommon.xsd"/>
-	<import namespace="http://ws.gematik.de/consumer/EncryptionService/v2.0" schemaLocation="EncryptionService.xsd"/>
+	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" schemaLocation="CertificateServiceCommon.xsd"/>
+	<import namespace="http://ws.gematik.de/consumer/EncryptionService/v3.0" schemaLocation="EncryptionService.xsd"/>
 	<import namespace="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" schemaLocation="ConsumerCommon.xsd"/>
 	<import namespace="http://ws.gematik.de/tel/error/v2.0" schemaLocation="../tel/error/TelematikError.xsd"/>
 	<element name="SignDocument">
@@ -251,4 +253,4 @@
 		</complexType>
 	</element>
 	<element name="ReferenceToSignerCertificate" type="boolean"/>
-</schema>
+</schema>