Bugfix: Querformat, BKU 2.7.x, ...

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@35 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

4 files changed, 7 insertions, 31 deletions

diff --git a/work/templates/BKUVerifyTemplateB64_neueBKU.xml b/work/templates/BKUVerifyTemplateB64_neueBKU.xml
new file mode 100644
index 0000000..36b543a
--- /dev/null
+++ b/work/templates/BKUVerifyTemplateB64_neueBKU.xml
@@ -0,0 +1,6 @@
+<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Id="signature-SigIdReplace"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="CertAlgReplace"/><dsig:Reference Id="signed-data-reference-SigDataRefReplace" URI="#signed-data-object-SigDataObjURIReplace"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xpf:XPath xmlns:xpf="http://www.w3.org/2002/06/xmldsig-filter2" Filter="intersect">id('signed-data-object-SigDataObjURIReplace')/node()</xpf:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>DigestValueSignedDataReplace</dsig:DigestValue></dsig:Reference><dsig:Reference Id="etsi-data-reference-EtsiDataRefReplace" Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-EtsiDataObjURIReplace')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>DigestValueSignedPropertiesReplace</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>
+<dsig:SignatureValue>SignatureValueReplace</dsig:SignatureValue>
+<dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>X509CertificateReplace</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo>
+<dsig:Object Id="signed-data-object-SigDataObjURIReplace"><sl:Base64Content>Base64ContentReplace</sl:Base64Content></dsig:Object>
+<dsig:Object Id="etsi-data-object-EtsiDataObjURIReplace">TemplateQualifyingPropertiesReplace</dsig:Object>
+</dsig:Signature>
\ No newline at end of file
diff --git a/work/templates/BKUVerifyTemplateSP_neueBKU.xml b/work/templates/BKUVerifyTemplateSP_neueBKU.xml
new file mode 100644
index 0000000..2589e62
--- /dev/null
+++ b/work/templates/BKUVerifyTemplateSP_neueBKU.xml
@@ -0,0 +1 @@
+<etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-SigIdReplace"><etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>SigningTimeReplace</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></etsi:DigestMethod><etsi:DigestValue>DigestValueX509CertificateReplace</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>X509IssuerNameReplace</dsig:X509IssuerName><dsig:X509SerialNumber>X509SerialNumberReplace</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied></etsi:SignaturePolicyImplied></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#signed-data-reference-SigDataRefReplace"><etsi:MimeType>text/plain</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties>
\ No newline at end of file
diff --git a/work/templates/MOAVerifyRequest.xml_response.xml b/work/templates/MOAVerifyRequest.xml_response.xml
deleted file mode 100644
index 09ba9d3..0000000
--- a/work/templates/MOAVerifyRequest.xml_response.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Bj\C3\B8rn M\C3\A5rte H\C3\B5cke\C3\9E\C3\B8\C3\B1,OU=Institute for Applied Information Processing and Communications,O=Graz University of Technology,STREET=Inffeldgasse 16a,L=Graz,ST=Styria,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK CaRA-DEMO Intermediate 2 SIGN CA,OU=Institute for Applied Information Processing and Communications,O=Graz University of Technology,STREET=Inffeldgasse 16a,L=Graz,ST=Styria,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>771772775598460003732973047476157302576497427577</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFDDCCA/SgAwIBAgIVAIcvfPiWCHkadbC6kmzRRSZMsgR5MA0GCSqGSIb3DQEB
-BQUAMIHqMQswCQYDVQQGEwJBVDEPMA0GA1UECBMGU3R5cmlhMQ0wCwYDVQQHEwRH
-cmF6MRkwFwYDVQQJExBJbmZmZWxkZ2Fzc2UgMTZhMSYwJAYDVQQKEx1HcmF6IFVu
-aXZlcnNpdHkgb2YgVGVjaG5vbG9neTFIMEYGA1UECxM/SW5zdGl0dXRlIGZvciBB
-cHBsaWVkIEluZm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRpb25z
-MS4wLAYDVQQDEyVJQUlLIENhUkEtREVNTyBJbnRlcm1lZGlhdGUgMiBTSUdOIENB
-MB4XDTA2MDgxNjE2MDcwM1oXDTA4MTIzMDIyNTkzMFowge0xCzAJBgNVBAYTAkFU
-MQ8wDQYDVQQIEwZTdHlyaWExDTALBgNVBAcTBEdyYXoxGTAXBgNVBAkTEEluZmZl
-bGRnYXNzZSAxNmExJjAkBgNVBAoTHUdyYXogVW5pdmVyc2l0eSBvZiBUZWNobm9s
-b2d5MUgwRgYDVQQLEz9JbnN0aXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24g
-UHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxMTAvBgNVBAMeKABCAGoA+ABy
-AG4AIABNAOUAcgB0AGUAIABIAPUAYwBrAGUA3gD4APEwgfMwgbwGByqGSM49AgEw
-gbACAQEwJAYHKoZIzj0BAQIZAP////////////////////7//////////zA0BBj/
-///////////////////+//////////wEGGQhBRnlnIDnD6fpq3IkMEn+uN7swUa5
-sQQxBBiNqA6wMJD2fL8g60OhiAD0/wr9gv8QEgcZK5X/yNp4YxAR7WskzdVz+Xeh
-HnlIEQIZAP///////////////5ne+DYUa8mxtNIoMQIBAQMyAARDgQH5L+3h+37Q
-8pZEiFSOSH3IHPt9KFuXbsipc21m6TX53G6fHrCwBG0QpdPevk6jgdMwgdAwDgYD
-VR0PAQH/BAQDAgbAMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFIcvfPiWCHkadbC6
-kmzRRBk09/XxMHAGA1UdIARpMGcwZQYMKwYBBAGVEgECBAEBMFUwUwYIKwYBBQUH
-AgIwRxpFVGhpcyBjZXJ0aWZpY2F0ZSBvbmx5IG1heSBiZSB1c2VkIGZvciBkZW1v
-bnN0cmF0aW9uIGFuZCB0ZXN0IHB1cnBvc2VzMB8GA1UdIwQYMBaAFIlmvQZGj/et
-LyG/A9DMHYl2NfHcMA0GCSqGSIb3DQEBBQUAA4IBAQAHLmbZeu6UJUyfYoK5tbei
-TfXLFa/0+PT6UsuWHkoHkU/Lh3n/1u2yCE7I21GPb+tDbrMbokuvBMYVaCwuhV1k
-rVsZVcLC/BWgHyCyXuDei6vYQWdkiQaMuTSnkxJU//a9rp3bwDM+AHb3+CDYXbXj
-7qaY/G0AS4zYnDclhnKswINpJEQjUjm/kdpMQPfXCreeoZQRVXcGVf9I8rYpZygm
-hW0JKlhywytAXsTeGj4yhRXUyEFUhXYoni0Cg5opg9A1K41pKOzZjnmrioR9LP+h
-r6c84a/NC00fA1b+XcIYxf98Izpu3SXpHzjdhPd0Eyr8odFdWsNWOwpsirGvo2Do</dsig:X509Certificate></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><SignatureManifestCheck><Code>0</Code></SignatureManifestCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/work/templates/utf8_plain.txt b/work/templates/utf8_plain.txt
deleted file mode 100644
index cbec467..0000000
--- a/work/templates/utf8_plain.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-@€
-