Removed certificates that are no more used.

3 files changed, 29 insertions, 29 deletions

diff --git a/java/coldfusion/src/CFLasso.java b/java/coldfusion/src/CFLasso.java
index 718434b4..824482bb 100644
--- a/java/coldfusion/src/CFLasso.java
+++ b/java/coldfusion/src/CFLasso.java
@@ -36,15 +36,15 @@
 public class CFLasso {
     protected com.entrouvert.lasso.LassoServer getServerContext() {
         com.entrouvert.lasso.LassoServer serverContext = new com.entrouvert.lasso.LassoServer(
-            "/home/manou/projects/lasso/lasso-devel/examples/data/sp-metadata.xml",
-            "/home/manou/projects/lasso/lasso-devel/examples/data/sp-public-key.pem",
-            "/home/manou/projects/lasso/lasso-devel/examples/data/sp-private-key.pem",
-            "/home/manou/projects/lasso/lasso-devel/examples/data/sp-crt.pem",
+            "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/metadata.xml'",
+	    NULL, //"/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/public-key.pem",
+            "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/private-key-raw.pem",
+            "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/certificate.pem",
             com.entrouvert.lasso.Lasso.signatureMethodRsaSha1);
         serverContext.addProvider(
-            "/home/manou/projects/lasso/lasso-devel/examples/data/idp-metadata.xml",
-            "/home/manou/projects/lasso/lasso-devel/examples/data/idp-public-key.pem",
-            "/home/manou/projects/lasso/lasso-devel/examples/data/ca-crt.pem");
+            "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/metadata.xml",
+            "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/public-key.pem",
+            "/home/manou/projects/lasso/lasso-devel/tests/data/ca1-la/certificate.pem");
 	return serverContext;
     }
 
@@ -58,7 +58,7 @@ public class CFLasso {
 
 	serverContext = getServerContext();
         loginContext = new com.entrouvert.lasso.LassoLogin(serverContext, null);
-        loginContext.initAuthnRequest("https://identity-provider:1998/liberty-alliance/metadata");
+        loginContext.initAuthnRequest("https://idp1:1998/metadata");
 	authnRequest = (com.entrouvert.lasso.LassoAuthnRequest) loginContext.getRequest();
         authnRequest.setPassive(false);
         authnRequest.setNameIdPolicy(com.entrouvert.lasso.Lasso.libNameIdPolicyTypeFederated);
diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java
index 9130dc81..29ca5bb9 100644
--- a/java/tests/LoginTest.java
+++ b/java/tests/LoginTest.java
@@ -41,30 +41,30 @@ import com.entrouvert.lasso.*;
 public class LoginTest extends TestCase {
     public String generateIdentityProviderContextDump() {
 	LassoServer serverContext = new LassoServer(
-            "../../examples/data/idp-metadata.xml",
-            "../../examples/data/idp-public-key.pem",
-            "../../examples/data/idp-private-key.pem",
-            "../../examples/data/idp-crt.pem",
-           Lasso.signatureMethodRsaSha1);
+            "../../tests/data/idp1-la/metadata.xml'",
+	    NULL, //"../../tests/data/idp1-la/public-key.pem",
+            "../../tests/data/idp1-la/private-key-raw.pem",
+            "../../tests/data/idp1-la/certificate.pem",
+	    Lasso.signatureMethodRsaSha1);
         serverContext.addProvider(
-            "../../examples/data/sp-metadata.xml",
-            "../../examples/data/sp-public-key.pem",
-            "../../examples/data/ca-crt.pem");
+            "../../tests/data/sp1-la/metadata.xml",
+            "../../tests/data/sp1-la/public-key.pem",
+            "../../tests/data/ca1-la/certificate.pem");
 	String serverContextDump = serverContext.dump();
         return serverContextDump;
     }
 
     public String generateServiceProviderContextDump() {
-        LassoServer serverContext = new LassoServer(
-            "../../examples/data/sp-metadata.xml",
-            "../../examples/data/sp-public-key.pem",
-            "../../examples/data/sp-private-key.pem",
-            "../../examples/data/sp-crt.pem",
-            Lasso.signatureMethodRsaSha1);
+	LassoServer serverContext = new LassoServer(
+            "../../tests/data/sp1-la/metadata.xml'",
+	    NULL, //"../../tests/data/sp1-la/public-key.pem",
+            "../../tests/data/sp1-la/private-key-raw.pem",
+            "../../tests/data/sp1-la/certificate.pem",
+	    Lasso.signatureMethodRsaSha1);
         serverContext.addProvider(
-            "../../examples/data/idp-metadata.xml",
-            "../../examples/data/idp-public-key.pem",
-            "../../examples/data/ca-crt.pem");
+            "../../tests/data/idp1-la/metadata.xml",
+            "../../tests/data/idp1-la/public-key.pem",
+            "../../tests/data/ca1-la/certificate.pem");
         String serverContextDump = serverContext.dump();
         return serverContextDump;
     }
diff --git a/python/tests/errorchecking_tests.py b/python/tests/errorchecking_tests.py
index 717cf4c6..3bee34cb 100644
--- a/python/tests/errorchecking_tests.py
+++ b/python/tests/errorchecking_tests.py
@@ -55,10 +55,10 @@ class ErrorCheckingTestCase(unittest.TestCase):
         # This time; we got something wrong as query string; we pass it to
         # init_from_authn_request_msg; surely it shouldn't segfault
         server = lasso.Server.new(
-            '../../examples/data/idp-metadata.xml',
-            '../../examples/data/idp-public-key.pem',
-            '../../examples/data/idp-private-key.pem',
-            '../../examples/data/idp-crt.pem',
+            '../../tests/data/idp1-la/metadata.xml',
+            None, # '../../tests/data/idp1-la/public-key.pem' is no more used
+            '../../tests/data/idp1-la/private-key-raw.pem',
+            '../../tests/data/idp1-la/certificate.pem',
             lasso.signatureMethodRsaSha1)
         login = lasso.Login.new(server)
         try: