6 files changed, 23 insertions, 21 deletions
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/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/BKUSignRequestDetached.xml b/work/templates/bku.etsi-bka-1.0.sign.xml
index c00e05b..c00e05b 100644
--- a/work/templates/BKUSignRequestDetached.xml
+++ b/work/templates/bku.etsi-bka-1.0.sign.xml
diff --git a/work/templates/BKUVerifyTemplateDetached.xml b/work/templates/bku.etsi-bka-1.0.verify.template.keys.xml
index 19a2c1c..19a2c1c 100644
--- a/work/templates/BKUVerifyTemplateDetached.xml
+++ b/work/templates/bku.etsi-bka-1.0.verify.template.keys.xml
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/MOASignRequestDetached.xml b/work/templates/moa.etsi-bka-1.0.sign.xml
index 4bf42cf..4bf42cf 100644
--- a/work/templates/MOASignRequestDetached.xml
+++ b/work/templates/moa.etsi-bka-1.0.sign.xml