local merge

Merge branch 'master' of https://gitlab.iaik.tugraz.at/egiz/moa-sig

5 files changed, 115 insertions, 2 deletions

diff --git a/moaSig/handbook/conf/moa-spss/log4j.properties b/moaSig/handbook/conf/moa-spss/log4j.properties
index 023cdc0..562d450 100644
--- a/moaSig/handbook/conf/moa-spss/log4j.properties
+++ b/moaSig/handbook/conf/moa-spss/log4j.properties
@@ -7,8 +7,8 @@ org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFacto
 
 # Configure root logger and loggers for moa-spss
 log4j.rootLogger=info, stdout
-log4j.logger.at.gv.egovernment.moa.spss.server=info, moaspss
-log4j.logger.at.gv.egovernment.moa.spss=warn, moaspss
+log4j.logger.at.gv.egovernment.moa.spss=info, moaspss
+log4j.logger.at.gv.egovernment.moa.sig=info, moaspss
 log4j.logger.iaik.server=warn, moaspss
 
 # Configure the 'stdout' appender to write logging output to the console
diff --git a/moaSig/handbook/conf/moa-spss/sp.minimum_with_tsl.config.xml b/moaSig/handbook/conf/moa-spss/sp.minimum_with_tsl.config.xml
index 2a8cdd0..06b1647 100644
--- a/moaSig/handbook/conf/moa-spss/sp.minimum_with_tsl.config.xml
+++ b/moaSig/handbook/conf/moa-spss/sp.minimum_with_tsl.config.xml
@@ -129,6 +129,10 @@
 					<cfg:Period>86400000</cfg:Period>

 				</cfg:UpdateSchedule>

 				<cfg:WorkingDirectory>tslworking</cfg:WorkingDirectory>

+        <cfg:Evaluation>

+          <cfg:QCQualifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC,http://uri.etsi.org/TrstSvc/Svctype/TSA/QTST</cfg:QCQualifier>

+          <cfg:SSCDQualifier>http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD,http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithQSCD</cfg:SSCDQualifier>

+        </cfg:Evaluation>

 			</cfg:TSLConfiguration>-->

 		</cfg:CertificateValidation>

 	</cfg:SignatureVerification>

diff --git a/moaSig/handbook/conf/moa-spss/svaconfig.example b/moaSig/handbook/conf/moa-spss/svaconfig.example
new file mode 100644
index 0000000..cdb972f
--- /dev/null
+++ b/moaSig/handbook/conf/moa-spss/svaconfig.example
@@ -0,0 +1,74 @@
+#Fri Jul 27 14:18:37 CEST 2012
+#
+# Format [key]=[value]
+# 
+# Note that if an '=' is used in a key or value it has to be escaped: "\="
+
+##################### WebConfig #######################
+
+#The path to the sva configuration file
+#svaconfig=/data/sigval/incoming/svaconfig
+
+#The directories where to store the collected testdata
+#testdir=/data/sigval/incoming/test/
+
+#The basepath for signature validation
+#basepath=
+
+######################################################
+
+#The path prefix for all file system locations
+#pathprefix=/home/afitzek/server/moa-spss/apache-tomcat-8.0.0-RC3/conf/moa-spss/sva/
+
+#The file where the xmldsig core schema is located
+#xmlschemaloc=example/schema/xmldsig-core-schema.xsd
+
+#The root folder where truststore and certstore are created later on
+#certroot=example/certs
+
+#The folder containing the trustanchors
+#trustanchorloc=example/keys_and_certs
+
+#The folder containing the timestampauthority trustanchors
+#tsttrustanchorloc=example/keys_and_certs
+
+#The folder containing alternative revocation information (comment out to use
+#infos contained in the certificate)
+#altdp=
+
+#The maximum age of a revocation information of a end user certificate in hours
+#endusercertgrace=4382
+
+#The maximum age of a revocation information for a ca certificate in hours
+#cacertgrace=4382
+
+#tstcoherencetolerance=10
+
+#The maximum time difference (in hours) the signing-time property and a 
+#time stamp
+#timestampdelay=24
+
+# Defines the forbidden hashing algorithms and the inception date
+# Format: {<algorithm name>, <inception date>};{<algname 2>, <inc date 2>}...
+#hashconstraint={md5, 2000-08-08};{sha1, 2016-08-08}
+
+# Defines the forbidden hashing algorithms for CA Certificates and the inception date
+# Format: {<algorithm name>, <inception date>};{<algname 2>, <inc date 2>}...
+#cahashconstraint={md5,2000-08-08};{sha1, 2012-08-05}
+
+# Defines the minimum required key lengths
+# Format: {<algorithm name>, <min len>,<inception date>};{...}...
+#keylenconstraint={rsa, 1024, 2000-08-08}
+
+# Defines the minimum required key lengths for CA Certificates
+# Format: {<algorithm name>, <min len>,<inception date>};{...}..
+#cakeylenconstraint={rsa,512,2000-08-08}
+
+# Defines the minimum required key lengths for timestamps
+# Format: {<algorithm name>, <min len>,<inception date>};{...}...
+#tstkeylenconstraint={rsa, 1024, 2000-08-08}
+
+# Allows any key usage if set to true, otherwise only dig. signature
+allowanykeyusage=true
+
+chainingmodel=SHELL
diff --git a/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/EC_DIGIT.20131030-20161030.SerNo79A1C51E6E5FE7CCD8BF6D097ECA55277868B2C6.cer b/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/EC_DIGIT.20131030-20161030.SerNo79A1C51E6E5FE7CCD8BF6D097ECA55277868B2C6.cer
new file mode 100644
index 0000000..6a81c11
--- /dev/null
+++ b/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/EC_DIGIT.20131030-20161030.SerNo79A1C51E6E5FE7CCD8BF6D097ECA55277868B2C6.cer
@@ -0,0 +1,35 @@
+MIIGgTCCBGmgAwIBAgIUeaHFHm5f58zYv20JfspVJ3hossYwDQYJKoZIhvcNAQEF
+BQAwgZIxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsg
+Qi5WLjEoMCYGA1UECxMfSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE3
+MDUGA1UEAxMuUXVvVmFkaXMgRVUgSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSBHMjAeFw0xMzEwMzAxMjI3MTFaFw0xNjEwMzAxMjI3MTFaMHoxCzAJBgNV
+BAYTAkJFMRAwDgYDVQQIEwdCcnVzc2VsMRIwEAYDVQQHEwlFdHRlcmJlZWsxHDAa
+BgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFDASBgNVBAsTC0luZm9ybWF0aWNz
+MREwDwYDVQQDDAhFQ19ESUdJVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJgkkqvJmZaknQC7c6H6LEr3dGtQ5IfOB3HAZZxOZbb8tdM1KMTO3sAifJC5
+HNFeIWd0727uZj+V5kBrUv36zEs+VxiN1yJBmcJznX4J2TCyPfLk2NRELGu65Vwr
+K2Whp8cLLANc+6pQn/5wKh23ehZm21mLXcicZ8whksUGb/h8p6NDe1cElD6veNc9
+CwwK2QT0G0mQiEYchqjJkqyY8HEak8t+CbIC4Rrhyxh3HI1fCK0WKS9JjbPQFbvG
+mfpBZuLPYZYzP4UXIqfBVYctyodcSAnSfmy6tySMqpVSRhjRn4KP0EfHlq7Ec+H3
+nwuqxd0M4vTJlZm+XwYJBzEFzFsCAwEAAaOCAeQwggHgMFgGA1UdIARRME8wCAYG
+BACLMAECMEMGCisGAQQBvlgBgxAwNTAzBggrBgEFBQcCARYnaHR0cDovL3d3dy5x
+dW92YWRpc2dsb2JhbC5ubC9kb2N1bWVudGVuMCQGCCsGAQUFBwEDBBgwFjAKBggr
+BgEFBQcLAjAIBgYEAI5GAQEwdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5o
+dHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6
+Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZldWNhZzIuY3J0MEYGCiqGSIb3
+LwEBCQEEODA2AgEBhjFodHRwOi8vdHNhMDEucXVvdmFkaXNnbG9iYWwuY29tL1RT
+Uy9IdHRwVHNwU2VydmVyMBMGCiqGSIb3LwEBCQIEBTADAgEBMA4GA1UdDwEB/wQE
+AwIGQDAfBgNVHSMEGDAWgBTg+A751LXyf0kjtsN5x6M1H4Z6iDA7BgNVHR8ENDAy
+MDCgLqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV1Y2FnMi5j
+cmwwHQYDVR0OBBYEFDc3hgIFJTDamDEeQczI7Lot4uaVMA0GCSqGSIb3DQEBBQUA
+A4ICAQAZ8EZ48RgPimWY6s4LjZf0M2MfVJmNh06Jzmf6fzwYtDtQLKzIDk8Ztosq
+YpNNBoZIFICMZguGRAP3kuxWvwANmrb5HqyCzXThZVPJTmKEzZNhsDtKu1almYBs
+zqX1UV7IgZp+jBZ7FyXzXrXyF1tzXQxHGobDV3AEE8vdzEZtwDGpZJPnEPCBzifd
+Y+lrrL2rDBjbv0VeildgOP1SIlL7dh1O9f0T6T4ioS6uSdMt6b/OWjqHadsSpKry
+0A6pqfOqJWAhDiueqgVB7vus6o6sSmfG4SW9EWW+BEZ510HjlQU/JL3PPmf+Xs8s
+00sm77LJ/T/1hMUuGp6TtDsJe+pPBpCYvpm6xu9GL20CsArFWUeQ2MSnE1jsrb00
+UniCKslcM63pU7I0VcnWMJQSNY28OmnFESPK6s6zqoN0ZMLhwCVnahi6pouBwTb1
+0M9/Anla9xOT42qxiLr14S2lHy18aLiBSQ4zJKNLqKvIrkjewSfW+00VLBYbPTmt
+rHpZUWiCGiRS2SviuEmPVbdWvsBUaq7OMLIfBD4nin1FlmYnaG9TVmWkwVYDsFmQ
+epwPDqjPs4efAxzkgUFHWn0gQFbqxRocKrCsOvCDHOHORA97UWcThmgvr0Jl7ipv
+P4Px//tRp08blfy4GMzYls5WF8f6JaMrNGmpfPasd9NbpBNp7A==
\ No newline at end of file
diff --git a/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/Pierre_Damas_(Signature).20130717-20180714.SerNo1000000000005A04B848690925470777.cer b/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/Pierre_Damas_(Signature).20130717-20180714.SerNo1000000000005A04B848690925470777.cer
new file mode 100644
index 0000000..bc706d9
--- /dev/null
+++ b/moaSig/handbook/conf/moa-spss/tslworking/trust/eu/Pierre_Damas_(Signature).20130717-20180714.SerNo1000000000005A04B848690925470777.cer