From ce356dfacb8160aec40c5e1645496ba2ea79d739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Magnus=20Landr=C3=B8?= <stefan.landro@gmail.com>
Date: Tue, 24 Jun 2014 16:18:42 +0200
Subject: [PATCH 1/2] Rettet opp i feil knyttet til Signature elementet.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Tidligere var elementet i sdp namespacet, mens det skulle vært i dsig namespacet ref konvensjonell bruk av dsig.
---
 xsd/sdp-felles.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/sdp-felles.xsd b/xsd/sdp-felles.xsd
index d9dee2e..66f9519 100644
--- a/xsd/sdp-felles.xsd
+++ b/xsd/sdp-felles.xsd
@@ -9,7 +9,7 @@
 
 	<xsd:complexType name="Melding" abstract="true">
 		<xsd:sequence>
-			<xsd:element name="Signature" type="ds:SignatureType" minOccurs="1" maxOccurs="1" />
+			<xsd:element ref="ds:Signature" minOccurs="1" maxOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
 

From 57c5c94bce4cba2fda75bc0015789c93b8f4a0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Magnus=20Landr=C3=B8?= <stefan.landro@gmail.com>
Date: Wed, 25 Jun 2014 08:39:56 +0200
Subject: [PATCH 2/2] Fjernet tilbaketrekkingskvitteringer

---
 eksempler/sdpKvittering-tilbaketrekking.xml | 56 ---------------------
 xsd/sdp-kvittering.xsd                      | 20 --------
 2 files changed, 76 deletions(-)
 delete mode 100644 eksempler/sdpKvittering-tilbaketrekking.xml

diff --git a/eksempler/sdpKvittering-tilbaketrekking.xml b/eksempler/sdpKvittering-tilbaketrekking.xml
deleted file mode 100644
index d9a1754..0000000
--- a/eksempler/sdpKvittering-tilbaketrekking.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kvittering xmlns="http://begrep.difi.no/sdp/schema_v10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-kvittering.xsd ">
-
-	
-	<Signature>
-		<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-			<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-			<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
-			<Reference URI="">
-				<Transforms>
-					<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-				</Transforms>
-				<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-				<DigestValue>uooqbWYa5VCqcJCbuymBKqm17vY=</DigestValue>
-			</Reference>
-		</SignedInfo>
-		<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew==</SignatureValue>
-		<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-			<X509Data>
-				<X509Certificate>MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P
-					MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz
-					cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo
-					MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL
-					DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5
-					ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY
-					KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN
-					OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1
-					TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX
-					2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq
-					KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4
-					hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU
-					5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM
-					KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f
-					BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz
-					Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz
-					LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh
-					dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0
-					dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B
-					AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS
-					GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga
-					wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T
-					/55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3
-					UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ
-					TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg==
-				</X509Certificate>
-			</X509Data>
-		</KeyInfo>
-	</Signature>
-
-	<tidspunkt>2014-05-19T12:00:00</tidspunkt>
-	<tilbaketrekking>
-		<status>OK</status>
-		<beskrivelse>Meldingen er satt i karantene og vil ikke vises for mottaker.</beskrivelse>
-	</tilbaketrekking>
-
-</kvittering>
diff --git a/xsd/sdp-kvittering.xsd b/xsd/sdp-kvittering.xsd
index 1a86f18..656373e 100644
--- a/xsd/sdp-kvittering.xsd
+++ b/xsd/sdp-kvittering.xsd
@@ -17,7 +17,6 @@
 						<xsd:element name="levering" type="Levering"/>
 						<xsd:element name="aapning" type="Aapning"/>
 						<xsd:element name="varslingfeilet" type="Varslingfeilet"/>
-						<xsd:element name="tilbaketrekking" type="Tilbaketrekkingsresultat" />
 					</xsd:choice>
 				</xsd:sequence>
 			</xsd:extension>
@@ -58,25 +57,6 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
-	<xsd:complexType name="Tilbaketrekkingsresultat">
-		<xsd:annotation>
-			<xsd:documentation>
-				Kvitteringen gir informasjon om DigitalPost som ble forespurt tilbaketrukket
-				ble satt i karantene eller ikke.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="status" type="Tilbaketrekkingsstatus" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="beskrivelse" type="Beskrivelse" minOccurs="0" maxOccurs="1"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:simpleType name="Tilbaketrekkingsstatus">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="OK" />
-			<xsd:enumeration value="FEILET" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
 	<xsd:simpleType name="Beskrivelse">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="1000"/>