From 27695abe4b25b8aef99dcee4c258a25a8a341c8b Mon Sep 17 00:00:00 2001
From: knowcenter <knowcenter@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Tue, 17 Jul 2007 13:01:21 +0000
Subject: config file updated, template files renamed

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@130 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 work/cfg/config.properties                            | 15 +++++++++------
 work/templates/BKUSignRequestDetached.xml             | 17 -----------------
 work/templates/BKUVerifyTemplateDetached.xml          | 13 -------------
 work/templates/MOASignRequestDetached.xml             | 19 -------------------
 work/templates/MOAVerifyRequestDetached.xml           | 15 ---------------
 work/templates/bku.etsi-bka-1.0.sign.xml              | 17 +++++++++++++++++
 .../bku.etsi-bka-1.0.verify.template.keys.xml         | 13 +++++++++++++
 work/templates/bku.etsi-bka-1.0.verify.template.xml   | 14 ++++++++++++++
 work/templates/moa.etsi-bka-1.0.sign.xml              | 19 +++++++++++++++++++
 9 files changed, 72 insertions(+), 70 deletions(-)
 delete mode 100644 work/templates/BKUSignRequestDetached.xml
 delete mode 100644 work/templates/BKUVerifyTemplateDetached.xml
 delete mode 100644 work/templates/MOASignRequestDetached.xml
 delete mode 100644 work/templates/MOAVerifyRequestDetached.xml
 create mode 100644 work/templates/bku.etsi-bka-1.0.sign.xml
 create mode 100644 work/templates/bku.etsi-bka-1.0.verify.template.keys.xml
 create mode 100644 work/templates/bku.etsi-bka-1.0.verify.template.xml
 create mode 100644 work/templates/moa.etsi-bka-1.0.sign.xml

diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index 468c601..765d923 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -12,7 +12,7 @@
 default.bku.signature.id=etsi-bka-1.0
 default.moa.signature.id=etsi-bka-1.0
 # MOA Signatur-Kennzeichnung vorhanden
-moa.sign.id.active=false
+moa.sign.id.active=true
 # MOA Detached-Signieren aus Konsole (Commandline) verfügbar
 moa.sign.cmd.detached=false
 
@@ -46,12 +46,13 @@ bku.sign.request.base64=./templates/BKUSignRequestBase64.xml
 bku.sign.request.template=./templates/bku.etsi-bka-1.0.sign.xml
 
 bku.verify.url=http://127.0.0.1:3495/http-security-layer-request
+bku.verify.request.template.keys=./templates/bku.etsi-bka-1.0.verify.template.keys.xml
+bku.verify.request.template=./templates/bku.etsi-bka-1.0.verify.template.xml
+
+# alte Templates
 bku.verify.request.base64=./templates/BKUVerifyRequestBase64.xml
-bku.verify.request.detached=./templates/BKUVerifyRequestDetached.xml
 bku.verify.template.base64old=./templates/BKUVerifyTemplateBase64old.xml
 bku.verify.template.base64=./templates/BKUVerifyTemplateBase64.xml
-bku.verify.template.detached=./templates/BKUVerifyTemplateDetached.xml
-
 
 a1.available_for_web=false
 a1.available_for_commandline=false
@@ -75,11 +76,13 @@ moa.sign.request.base64=./templates/MOASignRequestBase64.xml
 moa.sign.request.template=./templates/moa.etsi-bka-1.0.sign.xml
 
 moa.verify.url=http://127.0.0.1:18080/moa-spss/services/SignatureVerification
+moa.verify.request.template=./templates/moa.etsi-bka-1.0.verify.template.xml
+moa.verify.request.template.keys=./templates/moa.etsi-bka-1.0.verify.template.keys.xml
+
+# alte Templates
 moa.verify.TrustProfileID=Test-Signaturdienste
 moa.verify.request.base64=./templates/old/MOAVerifyRequest.xml
-moa.verify.request.detached=./templates/MOAVerifyRequestDetached.xml
 moa.verify.template.base64=./templates/MOAVerifyTemplateBase64.xml
-moa.verify.template.detached=./templates/MOAVerifyTemplateDetached.xml
 
 
 #############################################
diff --git a/work/templates/BKUSignRequestDetached.xml b/work/templates/BKUSignRequestDetached.xml
deleted file mode 100644
index c00e05b..0000000
--- a/work/templates/BKUSignRequestDetached.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-<sl:KeyboxIdentifier>KeyboxIdentifierReplace</sl:KeyboxIdentifier>
-<sl:DataObjectInfo Structure="detached">
-<sl:DataObject Reference="urn:Document"/>
-<sl:TransformsInfo>
-<sl:FinalDataMetaInfo>
-<sl:MimeType>MimeTypeReplace</sl:MimeType>
-</sl:FinalDataMetaInfo>
-</sl:TransformsInfo>
-<sl:Supplement>
-<sl:Content Reference="urn:Document">
-<sl:LocRefContent>LocRefContentReplace</sl:LocRefContent>
-</sl:Content>
-</sl:Supplement>
-</sl:DataObjectInfo>
-</sl:CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/work/templates/BKUVerifyTemplateDetached.xml b/work/templates/BKUVerifyTemplateDetached.xml
deleted file mode 100644
index 19a2c1c..0000000
--- a/work/templates/BKUVerifyTemplateDetached.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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="urn:Document">
-<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="etsi-data-object-EtsiDataObjURIReplace"><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>MimeTypeReplace</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object>
-</dsig:Signature>
\ No newline at end of file
diff --git a/work/templates/MOASignRequestDetached.xml b/work/templates/MOASignRequestDetached.xml
deleted file mode 100644
index 4bf42cf..0000000
--- a/work/templates/MOASignRequestDetached.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<KeyIdentifier>KeyIdentifierReplace</KeyIdentifier>
-<SingleSignatureInfo SecurityLayerConformity="true">
-<DataObjectInfo Structure="detached">
-<DataObject Reference="urn:Document">
-  <LocRefContent>LocRefContentReplace</LocRefContent>
-</DataObject>
-<CreateTransformsInfoProfile>
-<CreateTransformsInfo>
-<FinalDataMetaInfo>
-<MimeType>MimeTypeReplace</MimeType>
-</FinalDataMetaInfo>
-</CreateTransformsInfo>
-</CreateTransformsInfoProfile>
-</DataObjectInfo>
-</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-
diff --git a/work/templates/MOAVerifyRequestDetached.xml b/work/templates/MOAVerifyRequestDetached.xml
deleted file mode 100644
index b544c5c..0000000
--- a/work/templates/MOAVerifyRequestDetached.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent>XMLContentReplace</XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SupplementProfile>
-    <Content Reference="urn:Document">
-      <LocRefContent>LocRefContentReplace</LocRefContent>
-    </Content>
-  </SupplementProfile>
-  <TrustProfileID>TrustProfileIDReplace</TrustProfileID>
-</VerifyXMLSignatureRequest>
\ No newline at end of file
diff --git a/work/templates/bku.etsi-bka-1.0.sign.xml b/work/templates/bku.etsi-bka-1.0.sign.xml
new file mode 100644
index 0000000..c00e05b
--- /dev/null
+++ b/work/templates/bku.etsi-bka-1.0.sign.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>KeyboxIdentifierReplace</sl:KeyboxIdentifier>
+<sl:DataObjectInfo Structure="detached">
+<sl:DataObject Reference="urn:Document"/>
+<sl:TransformsInfo>
+<sl:FinalDataMetaInfo>
+<sl:MimeType>MimeTypeReplace</sl:MimeType>
+</sl:FinalDataMetaInfo>
+</sl:TransformsInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>LocRefContentReplace</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/work/templates/bku.etsi-bka-1.0.verify.template.keys.xml b/work/templates/bku.etsi-bka-1.0.verify.template.keys.xml
new file mode 100644
index 0000000..19a2c1c
--- /dev/null
+++ b/work/templates/bku.etsi-bka-1.0.verify.template.keys.xml
@@ -0,0 +1,13 @@
+<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="urn:Document">
+<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="etsi-data-object-EtsiDataObjURIReplace"><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>MimeTypeReplace</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object>
+</dsig:Signature>
\ No newline at end of file
diff --git a/work/templates/bku.etsi-bka-1.0.verify.template.xml b/work/templates/bku.etsi-bka-1.0.verify.template.xml
new file mode 100644
index 0000000..6ddefa3
--- /dev/null
+++ b/work/templates/bku.etsi-bka-1.0.verify.template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:VerifyXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+<sl:SignatureInfo>
+<sl:SignatureEnvironment>
+<sl:XMLContent>XMLContentReplace</sl:XMLContent>
+</sl:SignatureEnvironment>
+<sl:SignatureLocation>/dsig:Signature</sl:SignatureLocation>
+</sl:SignatureInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>LocRefContentReplace</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:VerifyXMLSignatureRequest>
\ No newline at end of file
diff --git a/work/templates/moa.etsi-bka-1.0.sign.xml b/work/templates/moa.etsi-bka-1.0.sign.xml
new file mode 100644
index 0000000..4bf42cf
--- /dev/null
+++ b/work/templates/moa.etsi-bka-1.0.sign.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+<KeyIdentifier>KeyIdentifierReplace</KeyIdentifier>
+<SingleSignatureInfo SecurityLayerConformity="true">
+<DataObjectInfo Structure="detached">
+<DataObject Reference="urn:Document">
+  <LocRefContent>LocRefContentReplace</LocRefContent>
+</DataObject>
+<CreateTransformsInfoProfile>
+<CreateTransformsInfo>
+<FinalDataMetaInfo>
+<MimeType>MimeTypeReplace</MimeType>
+</FinalDataMetaInfo>
+</CreateTransformsInfo>
+</CreateTransformsInfoProfile>
+</DataObjectInfo>
+</SingleSignatureInfo>
+</CreateXMLSignatureRequest>
+
-- 
cgit v1.2.3