detached connectors

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

3 files changed, 12 insertions, 24 deletions

diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index 7aecb70..d1dd6d0 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -25,29 +25,16 @@ bku.available_for_commandline=true
 

 bku.sign.url=http://127.0.0.1:3495/http-security-layer-request

 bku.sign.KeyboxIdentifier=SecureSignatureKeypair

-

 bku.sign.request.base64=./templates/BKUSignRequestBase64.xml

 bku.sign.request.detached=./templates/BKUSignRequestDetached.xml

 

-bku.sign.request.binaer=./templates/BKUSignRequestBinaryDetached.xml

-bku.sign.request.text=./templates/BKUSignRequestTextualDetached.xml

-

 bku.verify.url=http://127.0.0.1:3495/http-security-layer-request

 bku.verify.request.base64=./templates/BKUVerifyRequestBase64.xml

 bku.verify.request.detached=./templates/BKUVerifyRequestDetached.xml

-

-# TODO

-#bku.verify.template=./templates/BKUVerifyTemplateB64.xml

-#bku.verify.template.SP=./templates/BKUVerifyTemplateSP.xml

-bku.verify.template=./templates/BKUVerifyTemplateDetached.xml

-bku.verify.template.SP=./templates/BKUVerifyTemplateSP.xml

-

+bku.verify.template.base64old=./templates/BKUVerifyTemplateBase64old.xml

 bku.verify.template.base64=./templates/BKUVerifyTemplateBase64.xml

 bku.verify.template.detached=./templates/BKUVerifyTemplateDetached.xml

 

-bku.verify.template2=./templates/BKUVerifyTemplateB64_neueBKU.xml

-bku.verify.template2.SP=./templates/BKUVerifyTemplateSP_neueBKU.xml

-

 

 a1.available_for_web=false

 a1.available_for_commandline=false

@@ -66,22 +53,14 @@ moa.available_for_web=true
 moa.available_for_commandline=true

 

 moa.sign.url=http://127.0.0.1:18080/moa-spss/services/SignatureCreation

-moa.sign.request=./templates/MOASignRequestB64.xml

-

+moa.sign.KeyIdentifier=TestKey2

 moa.sign.request.base64=./templates/MOASignRequestBase64.xml

 moa.sign.request.detached=./templates/MOASignRequestDetached.xml

 

-moa.sign.KeyIdentifier=TestKey2

-

 moa.verify.url=http://127.0.0.1:18080/moa-spss/services/SignatureVerification

+moa.verify.TrustProfileID=Test-Signaturdienste

 moa.verify.request.base64=./templates/old/MOAVerifyRequest.xml

 moa.verify.request.detached=./templates/MOAVerifyRequestDetached.xml

-

-

-moa.verify.template=./templates/MOAVerifyTemplateB64.xml

-moa.verify.template.SP=./templates/MOAVerifyTemplateSP.xml

-moa.verify.TrustProfileID=Test-Signaturdienste

-

 moa.verify.template.base64=./templates/MOAVerifyTemplateBase64.xml

 moa.verify.template.detached=./templates/old/MOAVerifyTemplateB64.xml

 

diff --git a/work/cfg/help_text.properties b/work/cfg/help_text.properties
index 75e7229..910fd3c 100644
--- a/work/cfg/help_text.properties
+++ b/work/cfg/help_text.properties
@@ -51,6 +51,9 @@ error.code.315=Beim Auffinden der Signaturen ist ein Fehler aufgetreten. Obwohl
 error.code.320=Es kann keine Verbindung zur Bürgerkartenumgebung hergestellt werden.

 error.code.330=Es kann keine Verbindung zu MOA hergestellt werden oder MOA hat den Request zurückgewiesen.

 

+# TODO remove this when MOA detached is ready

+error.code.370=Eine detached Signature kann zur Zeit mit MOA nicht überprüft werden.

+

 #NormalizeException

 error.code.400=Das Normalisierungsmodul kann nicht initialisiert werden.

 

diff --git a/work/templates/BKUVerifyTemplateBase64old.xml b/work/templates/BKUVerifyTemplateBase64old.xml
new file mode 100644
index 0000000..f1d04db
--- /dev/null
+++ b/work/templates/BKUVerifyTemplateBase64old.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="#etsi-data-object-EtsiDataObjURIReplace"><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('etsi-data-object-EtsiDataObjURIReplace')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><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"><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><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></dsig:Object>
+</dsig:Signature>
\ No newline at end of file