diff options
14 files changed, 74 insertions, 74 deletions
| diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12 b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12Binary files differ new file mode 100644 index 000000000..314cbc862 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12 diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.derBinary files differ new file mode 100644 index 000000000..1851527de --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystoreBinary files differ new file mode 100644 index 000000000..bd9765a4c --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12 b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12Binary files differ new file mode 100644 index 000000000..e5820fdf2 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12 diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.derBinary files differ new file mode 100644 index 000000000..f50aa4d68 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystoreBinary files differ new file mode 100644 index 000000000..bd9765a4c --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystoreBinary files differ index 517bf2c5b..da42549d4 100644 --- a/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore diff --git a/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystoreBinary files differ index 908e00b42..bdc296cf4 100644 --- a/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore +++ b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore diff --git a/spss/handbook/conf/moa-spss/certstore/15A052B0DC4E0333656264E2FEEBE45B1BE449BF/386C1663C6390BC288DC171522439210AF361958 b/spss/handbook/conf/moa-spss/certstore/15A052B0DC4E0333656264E2FEEBE45B1BE449BF/386C1663C6390BC288DC171522439210AF361958Binary files differ new file mode 100644 index 000000000..a5e651f86 --- /dev/null +++ b/spss/handbook/conf/moa-spss/certstore/15A052B0DC4E0333656264E2FEEBE45B1BE449BF/386C1663C6390BC288DC171522439210AF361958 diff --git a/spss/handbook/conf/moa-spss/certstore/5650A465FD3B5EF83639E11F324A2A0EA98AF935/4B5B0C2A0BF944CD467A6140F8C782E2BE9D15F9 b/spss/handbook/conf/moa-spss/certstore/5650A465FD3B5EF83639E11F324A2A0EA98AF935/4B5B0C2A0BF944CD467A6140F8C782E2BE9D15F9Binary files differ new file mode 100644 index 000000000..640918641 --- /dev/null +++ b/spss/handbook/conf/moa-spss/certstore/5650A465FD3B5EF83639E11F324A2A0EA98AF935/4B5B0C2A0BF944CD467A6140F8C782E2BE9D15F9 diff --git a/spss/handbook/conf/moa-spss/certstore/B749506C821467F7D6F4E8943D07DDED771A7B47/A5A00B223EF24AED92D03F652CFE367CA9D1B200 b/spss/handbook/conf/moa-spss/certstore/B749506C821467F7D6F4E8943D07DDED771A7B47/A5A00B223EF24AED92D03F652CFE367CA9D1B200Binary files differ new file mode 100644 index 000000000..05a8b86f9 --- /dev/null +++ b/spss/handbook/conf/moa-spss/certstore/B749506C821467F7D6F4E8943D07DDED771A7B47/A5A00B223EF24AED92D03F652CFE367CA9D1B200 diff --git a/spss/handbook/conf/moa-spss/sp.minimum.config.xml b/spss/handbook/conf/moa-spss/sp.minimum.config.xml index e2a556677..77bb8ab25 100644 --- a/spss/handbook/conf/moa-spss/sp.minimum.config.xml +++ b/spss/handbook/conf/moa-spss/sp.minimum.config.xml @@ -1,44 +1,44 @@  <?xml version="1.0" encoding="UTF-8"?> -<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper--> +<!--MOA SP 1.4 Configuration File-->  <cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> -<cfg:SignatureVerification> -<cfg:CertificateValidation> -<cfg:PathConstruction> -<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates> -<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess> -<cfg:CertificateStore> -<cfg:DirectoryStore> -<cfg:Location>certstore</cfg:Location> -</cfg:DirectoryStore> -</cfg:CertificateStore> -</cfg:PathConstruction> -<cfg:PathValidation> -<cfg:ChainingMode> -<cfg:DefaultMode>pkix</cfg:DefaultMode> -</cfg:ChainingMode> -<cfg:TrustProfile> -<cfg:Id>Test-Signaturdienste</cfg:Id> -<cfg:TrustAnchorsLocation>trustProfiles/test</cfg:TrustAnchorsLocation> -</cfg:TrustProfile> -</cfg:PathValidation> -<cfg:RevocationChecking> -<cfg:EnableChecking>true</cfg:EnableChecking> -<cfg:MaxRevocationAge>0</cfg:MaxRevocationAge> -<cfg:ServiceOrder> -<cfg:Service>CRL</cfg:Service> -<cfg:Service>OCSP</cfg:Service> -</cfg:ServiceOrder> -<cfg:Archiving> -<cfg:EnableArchiving>false</cfg:EnableArchiving> -<cfg:ArchiveDuration>365</cfg:ArchiveDuration> -<cfg:Archive> -<cfg:DatabaseArchive> -<cfg:JDBCURL>jdbc:url</cfg:JDBCURL> -<cfg:JDBCDriverClassName>fully.qualified.classname</cfg:JDBCDriverClassName> -</cfg:DatabaseArchive> -</cfg:Archive> -</cfg:Archiving> -</cfg:RevocationChecking> -</cfg:CertificateValidation> -</cfg:SignatureVerification> +	<cfg:SignatureVerification> +		<cfg:CertificateValidation> +			<cfg:PathConstruction> +				<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates> +				<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess> +				<cfg:CertificateStore> +					<cfg:DirectoryStore> +						<cfg:Location>certstore</cfg:Location> +					</cfg:DirectoryStore> +				</cfg:CertificateStore> +			</cfg:PathConstruction> +			<cfg:PathValidation> +				<cfg:ChainingMode> +					<cfg:DefaultMode>pkix</cfg:DefaultMode> +				</cfg:ChainingMode> +				<cfg:TrustProfile> +					<cfg:Id>Test-Signaturdienste</cfg:Id> +					<cfg:TrustAnchorsLocation>trustProfiles/test</cfg:TrustAnchorsLocation> +				</cfg:TrustProfile> +			</cfg:PathValidation> +			<cfg:RevocationChecking> +				<cfg:EnableChecking>true</cfg:EnableChecking> +				<cfg:MaxRevocationAge>0</cfg:MaxRevocationAge> +				<cfg:ServiceOrder> +					<cfg:Service>CRL</cfg:Service> +					<cfg:Service>OCSP</cfg:Service> +				</cfg:ServiceOrder> +				<cfg:Archiving> +					<cfg:EnableArchiving>false</cfg:EnableArchiving> +					<cfg:ArchiveDuration>365</cfg:ArchiveDuration> +					<cfg:Archive> +						<cfg:DatabaseArchive> +							<cfg:JDBCURL>jdbc:url</cfg:JDBCURL> +							<cfg:JDBCDriverClassName>fully.qualified.classname</cfg:JDBCDriverClassName> +						</cfg:DatabaseArchive> +					</cfg:Archive> +				</cfg:Archiving> +			</cfg:RevocationChecking> +		</cfg:CertificateValidation> +	</cfg:SignatureVerification>  </cfg:MOAConfiguration> diff --git a/spss/handbook/conf/moa-spss/spss.config.xml b/spss/handbook/conf/moa-spss/spss.config.xml index 0bea7a897..8e167af57 100644 --- a/spss/handbook/conf/moa-spss/spss.config.xml +++ b/spss/handbook/conf/moa-spss/spss.config.xml @@ -1,5 +1,5 @@  <?xml version="1.0" encoding="UTF-8"?> -<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper--> +<!--MOA SPSS 1.4 Configuration File-->  <cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">  	<cfg:SignatureCreation>  		<cfg:KeyModules> @@ -75,7 +75,7 @@  		<cfg:CertificateValidation>  			<cfg:PathConstruction>  				<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates> -				<cfg:UseAuthorityInformationAccess>true </cfg:UseAuthorityInformationAccess> +				<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess>  				<cfg:CertificateStore>  					<cfg:DirectoryStore>  						<cfg:Location>certstore</cfg:Location> diff --git a/spss/handbook/conf/moa-spss/ss.minimum.config.xml b/spss/handbook/conf/moa-spss/ss.minimum.config.xml index 8ab10a994..e1f874210 100644 --- a/spss/handbook/conf/moa-spss/ss.minimum.config.xml +++ b/spss/handbook/conf/moa-spss/ss.minimum.config.xml @@ -1,34 +1,34 @@  <?xml version="1.0" encoding="UTF-8"?> -<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper--> +<!--MOA SS 1.4 Configuration File-->  <cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> -<cfg:SignatureCreation> -<cfg:KeyModules> -<cfg:SoftwareKeyModule> -<cfg:Id>SKM_Kunde1</cfg:Id> -<cfg:FileName>keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12</cfg:FileName> -<cfg:Password>kunde1</cfg:Password> -</cfg:SoftwareKeyModule> -</cfg:KeyModules> -<cfg:KeyGroup> -<cfg:Id>KG_Kunde1</cfg:Id> -<cfg:Key> -<cfg:KeyModuleId>SKM_Kunde1</cfg:KeyModuleId> -<cfg:KeyCertIssuerSerial> -<dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName> -<dsig:X509SerialNumber>7</dsig:X509SerialNumber> -</cfg:KeyCertIssuerSerial> -</cfg:Key> -</cfg:KeyGroup> -<cfg:KeyGroupMapping> -<cfg:CustomerId> -<dsig:X509IssuerName>CN=Test CA - Verschl\C3\BCsselung B\C3\BCrger,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName> -<dsig:X509SerialNumber>0</dsig:X509SerialNumber> -</cfg:CustomerId> -<cfg:KeyGroupId>KG_Kunde1</cfg:KeyGroupId> -</cfg:KeyGroupMapping> -<cfg:XMLDSig> -<cfg:CanonicalizationAlgorithm>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</cfg:CanonicalizationAlgorithm> -<cfg:DigestMethodAlgorithm>http://www.w3.org/2000/09/xmldsig#sha1</cfg:DigestMethodAlgorithm> -</cfg:XMLDSig> -</cfg:SignatureCreation> +	<cfg:SignatureCreation> +		<cfg:KeyModules> +			<cfg:SoftwareKeyModule> +				<cfg:Id>SKM_Kunde1</cfg:Id> +				<cfg:FileName>keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12</cfg:FileName> +				<cfg:Password>kunde1</cfg:Password> +			</cfg:SoftwareKeyModule> +		</cfg:KeyModules> +		<cfg:KeyGroup> +			<cfg:Id>KG_Kunde1</cfg:Id> +			<cfg:Key> +				<cfg:KeyModuleId>SKM_Kunde1</cfg:KeyModuleId> +				<cfg:KeyCertIssuerSerial> +					<dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName> +					<dsig:X509SerialNumber>7</dsig:X509SerialNumber> +				</cfg:KeyCertIssuerSerial> +			</cfg:Key> +		</cfg:KeyGroup> +		<cfg:KeyGroupMapping> +			<cfg:CustomerId> +				<dsig:X509IssuerName>CN=Test CA - Verschl\C3\BCsselung B\C3\BCrger,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName> +				<dsig:X509SerialNumber>0</dsig:X509SerialNumber> +			</cfg:CustomerId> +			<cfg:KeyGroupId>KG_Kunde1</cfg:KeyGroupId> +		</cfg:KeyGroupMapping> +		<cfg:XMLDSig> +			<cfg:CanonicalizationAlgorithm>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</cfg:CanonicalizationAlgorithm> +			<cfg:DigestMethodAlgorithm>http://www.w3.org/2000/09/xmldsig#sha1</cfg:DigestMethodAlgorithm> +		</cfg:XMLDSig> +	</cfg:SignatureCreation>  </cfg:MOAConfiguration> | 
