1 files changed, 6 insertions, 5 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
index fde453920..6388042d9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
@@ -51,6 +51,7 @@ import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.SignatureTrustEngine;
 import org.opensaml.xml.validation.ValidationException;
 
+import at.gv.egovernment.moa.id.auth.exception.InvalidProtocolRequestException;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.config.PVPConfiguration;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AssertionValidationExeption;
@@ -91,11 +92,11 @@ public class SAMLVerificationEngine {
 
 		try {
 		    if (!sigTrustEngine.validate(samlObj.getSignature(), criteriaSet)) {
-		        throw new Exception("Signature was either invalid or signing key could not be established as trusted");
+		    	throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 		    }
 		} catch (SecurityException e) {
-		    // Indicates processing error evaluating the signature
 		    e.printStackTrace();
+		    throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 		}
 	}
 	
@@ -116,11 +117,11 @@ public class SAMLVerificationEngine {
 
 		try {
 		    if (!sigTrustEngine.validate(samlObj.getSignature(), criteriaSet)) {
-		        throw new Exception("Signature was either invalid or signing key could not be established as trusted");
+		        throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 		    }
 		} catch (SecurityException e) {
-		    // Indicates processing error evaluating the signature
-		    e.printStackTrace();
+			e.printStackTrace();
+			throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
 		}
 	}