Author: coheigea
Date: Tue Jan 7 12:07:20 2014
New Revision: 1556191
URL: http://svn.apache.org/r1556191
Log:
[WSS-489] - Extend Crypto interface with verifyTrustDirect() method
- Thanks to Andrei for the patch
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java?rev=1556191&r1=1556190&r2=1556191&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
Tue Jan 7 12:07:20 2014
@@ -190,6 +190,14 @@ public interface Crypto {
) throws WSSecurityException;
/**
+ * Evaluate whether a given public key should be trusted directly (located
inside trust repository).
+ *
+ * @param certs Certificate chain to validate
+ * @throws WSSecurityException if the certificate chain is invalid
+ */
+ void verifyDirectTrust(X509Certificate[] certs) throws WSSecurityException;
+
+ /**
* Evaluate whether a given public key should be trusted.
*
* @param publicKey The PublicKey to be evaluated
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java?rev=1556191&r1=1556190&r2=1556191&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
Tue Jan 7 12:07:20 2014
@@ -295,6 +295,11 @@ public abstract class CryptoBase impleme
return certs;
}
+ @Override
+ public void verifyDirectTrust(X509Certificate[] certs) throws
WSSecurityException {
+ verifyTrust(certs, true);
+ }
+
protected Object createBCX509Name(String s) {
if (BC_509CLASS_CONS != null) {
try {
