aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-06-27 15:17:32 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-06-27 15:17:32 +0200
commit59790d25a2a3869fd3d7b86b874c4dafe21fb9d7 (patch)
treeb1d7e7ca3b1de625cf13c4e13f29d8982278a21b /id/server/idserverlib/src
parentd8f886a98dd2c3eaec17623c4032395b54b15d62 (diff)
downloadmoa-id-spss-59790d25a2a3869fd3d7b86b874c4dafe21fb9d7.tar.gz
moa-id-spss-59790d25a2a3869fd3d7b86b874c4dafe21fb9d7.tar.bz2
moa-id-spss-59790d25a2a3869fd3d7b86b874c4dafe21fb9d7.zip
Change entitiesDescriptor trust lookup, changed version to 1.9.90-SNAPSHOT
Diffstat (limited to 'id/server/idserverlib/src')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java4
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
index 5f9f4d63b..9385c945f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
@@ -83,7 +83,7 @@ public class CredentialProvider {
return credential;
}
-
+ /*
public static Credential getTrustedCredential() throws CredentialsNotAvailableException {
String filename = PVPConfiguration.getInstance().getTrustEntityCertificate("sp.crt");
@@ -107,5 +107,5 @@ public class CredentialProvider {
credential.setPublicKey(cert.getPublicKey());
return credential;
- }
+ }*/
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
index 5bd0878a4..d3acf9351 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/EntityVerifier.java
@@ -54,7 +54,7 @@ public class EntityVerifier {
throw new SAMLRequestNotSignedException(e);
}
- Credential credential = CredentialProvider.getTrustedCredential();
+ Credential credential = CredentialProvider.getSPTrustedCredential(entityDescriptor.getName());
if(credential == null) {
throw new NoCredentialsException("moaID IDP");
}