Move shibdev cert/key to come from apache style files.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@889 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/origin.xml b/src/conf/origin.xml
index e495c79..c5ae7c8 100644 (file)
--- a/src/conf/origin.xml
+++ b/src/conf/origin.xml
@@ -1,43 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShibbolethOriginConfig xmlns="urn:mace:shibboleth:origin:1.0" xmlns:cred="urn:mace:shibboleth:credentials:1.0" xmlns:name="urn:mace:shibboleth:namemapper:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mace:shibboleth:origin:1.0 origin.xsd" 
-       AAUrl="http://snc.cc.columbia.edu/shibboleth/AA" defaultRelyingParty="urn:mace:inqueue" 
+       AAUrl="http://therock.cc.columbia.edu:6666/shibboleth/AA" defaultRelyingParty="urn:mace:inqueue" 
        providerId="urn:mace:inqueue:shibdev.edu">
 
        <RelyingParty name="urn:mace:inqueue" signingCredential="foo">
                <HSNameFormat nameMapping="crypto"/>
        </RelyingParty>
-
-       <RelyingParty name="urn:x-fed1" signingCredential="foo" passThruErrors="true">
-               <HSNameFormat nameMapping="crypto"/>
-       </RelyingParty>
-
-       <RelyingParty name="urn:x-columbia-intranet" signingCredential="foo" providerId="urn:x-columbia-intranet.columbia">
-               <HSNameFormat nameMapping="crypto"/>
-       </RelyingParty>
-
        
-       <ReleasePolicyEngine  arpTTL="300">
+       <ReleasePolicyEngine>
                <ArpRepository implementation="edu.internet2.middleware.shibboleth.aa.arp.provider.FileSystemArpRepository">
                        <Path>/conf/arps/</Path>
                </ArpRepository>
        </ReleasePolicyEngine>
        
-       <name:NameMapping xmlns="urn:mace:shibboleth:namemapper:1.0" id="crypto" format="urn:mace:shibboleth:1.0:nameIdentifier" type="CryptoHandleGenerator" handleTTL="1800">
-               <KeyStorePath>/conf/handle.jks</KeyStorePath>
-               <KeyStorePassword>shibhs</KeyStorePassword>
-               <KeyStoreKeyAlias>handlekey</KeyStoreKeyAlias>
-               <KeyStoreKeyPassword>shibhs</KeyStoreKeyPassword>
-       </name:NameMapping>
-
+       <name:NameMapping xmlns="urn:mace:shibboleth:namemapper:1.0" id="crypto" format="urn:mace:shibboleth:1.0:nameIdentifier" type="SharedMemoryShibHandle" handleTTL="1800"/>
        
-       <cred:Credentials>
-               <cred:KeyStoreResolver Id="foo" storeType="JKS">
-                       <cred:Path>/conf/keystore.jks</cred:Path>
-                       <cred:KeyAlias>shibhs</cred:KeyAlias>
-                       <cred:CertAlias>shibhs</cred:CertAlias>
-                       <cred:StorePassword>shibhs</cred:StorePassword>
-                       <cred:KeyPassword>shibhs</cred:KeyPassword>
-               </cred:KeyStoreResolver>
+       <cred:Credentials xmlns="urn:mace:shibboleth:credentials:1.0">
+               <FileResolver Id="foo">
+               <Key format="DER">
+                       <Path>/conf/shib2.key</Path>
+               </Key>
+               <Certificate format="PEM">
+                       <Path>/conf/shib2.crt</Path>
+               </Certificate>
+       </FileResolver>
        </cred:Credentials>
 
 </ShibbolethOriginConfig>

diff --git a/src/conf/shib2.crt b/src/conf/shib2.crt
new file mode 100644 (file)
index 0000000..03202e4
--- /dev/null
+++ b/src/conf/shib2.crt
@@ -0,0 +1,50 @@
+-----BEGIN CERTIFICATE-----
+MIICpDCCAg2gAwIBAgICAm8wDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVTMRIwEAYDVQQI
+EwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lz
+Y29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYD
+VQQDExxIRVBLSSBTZXJ2ZXIgQ0EgLS0gMjAwMjA3MDFBMB4XDTAyMDcyNjA1MDg1M1oXDTA2MDkw
+NDA1MDg1M1owZjEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEChMH
+VW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEcMBoGA1UEAxMTc2hpYjIuaW50ZXJuZXQyLmVkdTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzFSvS9qa/UsH9oJH+u1QM7c51P67owRcqEURhTDs
+tT3WBDsP5+YTIGUiwJMkM4hQII6yMI7in6DzbhGQx9T/q6xRqXFXqLk1nrc/kcs+hbR4T11wwW6v
+d1k3uBUHJXV+OzvMEwz2SS0RxFZDw5MGlwJGqkwe5wPN6QUWzCxvpskCAwEAAaMdMBswDAYDVR0T
+AQH/BAIwADALBgNVHQ8EBAMCBaAwDQYJKoZIhvcNAQEEBQADgYEAhrSMGqkpC0zdL/m37A7g32le
+1kgi9PMJzgviXbG1k4eO+xl6JvSfHMfrcjtcHdH+IWZSEoJsKLhGbSSBcOCX34rm4RqE8h4ahgq7
+cDX2RCaY4D26R2cta7ZvXo7CUgJ7vbybSZ7QbqKs3yZcVXIL5sJXkhbZ3dnZRqiEm2VP9ZY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC6zCCAlSgAwIBAgICAlYwDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoT
+F1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJ
+bmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBLSSBNYXN0ZXIgQ0Eg
+LS0gMjAwMjA3MDFBMB4XDTAyMDYzMDIyMzIxNFoXDTI3MDIyMDIyMzIxNFowgakx
+CzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlz
+b24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJE
+aXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBL
+SSBTZXJ2ZXIgQ0EgLS0gMjAwMjA3MDFBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCvImusW7uaRS7xLsi2ZzZuUz6gbfATwxwvtQ+8cuyDpRlhvr1qnghC9Enj
+RH9qpq/Z5FVZ5bqyGziCy0kEPt+2WiZMGRiQEzloi5HNEtz1Nlc7FCJ0HATxtkEU
+hQ96v2DmoIEogPINqLICIqfiraPWFHOp6qDritrdj/fwLptQawIDAQABoyAwHjAP
+BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBpjANBgkqhkiG9w0BAQQFAAOBgQAt
+txlP3fTyIVMAIm8ddE8Bvk0/5Bhn5KvMAOMtnlCEArcFd4/m+pU4vEDwK6JSIoKf
+N/ySLXlu5ItApeJMWhcqvrczq5BF4/WQZukC1ha6FS2cAmjy35jYWMfVWcdBi9Yi
+M4SJ6gjGf83y9axPpuHcjwxQ5fLqZfnvrWH+1owJhQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC6zCCAlSgAwIBAgICAlQwDQYJKoZIhvcNAQEEBQAwgakxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlzb24xIDAeBgNVBAoT
+F1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJEaXZpc2lvbiBvZiBJ
+bmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBLSSBNYXN0ZXIgQ0Eg
+LS0gMjAwMjA3MDFBMB4XDTAyMDYzMDIyMTYzOVoXDTI5MTExNjIyMTYzOVowgakx
+CzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlXaXNjb25zaW4xEDAOBgNVBAcTB01hZGlz
+b24xIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgV2lzY29uc2luMSswKQYDVQQLEyJE
+aXZpc2lvbiBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSUwIwYDVQQDExxIRVBL
+SSBNYXN0ZXIgQ0EgLS0gMjAwMjA3MDFBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQDJ3FDZym9Ja94DP7TUZXf3Vu3CZwqZzYThgjUT2eBJBYVALISSJ+RjJ2j2
+CYpq3wesSgWHqfrpPnTgTBvn5ZZF9diX6ipAmC0H75nySDY8B5AN1RbmPsAZ51F9
+7Eo+6JZ59BFYgowGXyQpMfhBykBSySnvnOX5ygTCz20LwKkErQIDAQABoyAwHjAP
+BgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBpjANBgkqhkiG9w0BAQQFAAOBgQB1
+8ZXB+KeXbDVkz+b2xVXYmJiWrp73IOvi3DuIuX1n88tbIH0ts7dJLEqr+c0owgtu
+QBqLb9DfPG2GkJ1uOK75wPY6XWusCKDJKMVY/N4ec9ew55MnDlFFvl4C+LkiS2YS
+Ysrh7fFJKKp7Pkc1fxsusK+MBXjVZtq0baXsU637qw==
+-----END CERTIFICATE-----

diff --git a/src/conf/shib2.key b/src/conf/shib2.key
new file mode 100644 (file)
index 0000000..f93603b
Binary files /dev/null and b/src/conf/shib2.key differ