You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/07/22 23:39:49 UTC
cvs commit: ws-fx/wss4j/src/org/apache/ws/security/message/token PKIPathSecurity.java
dims 2004/07/22 14:39:49
Modified: wss4j/src/org/apache/ws/security WSSecurityEngine.java
wss4j/src/org/apache/ws/security/message WSSignEnvelope.java
wss4j/src/org/apache/ws/security/message/token
PKIPathSecurity.java
Log:
patches from David Del Vecchio <dd...@virginia.edu>
Revision Changes Path
1.32 +1 -1 ws-fx/wss4j/src/org/apache/ws/security/WSSecurityEngine.java
Index: WSSecurityEngine.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/WSSecurityEngine.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WSSecurityEngine.java 22 Jul 2004 18:31:11 -0000 1.31
+++ WSSecurityEngine.java 22 Jul 2004 21:39:48 -0000 1.32
@@ -633,7 +633,7 @@
throws WSSecurityException {
BinarySecurity token = createSecurityToken(elem);
if (token instanceof PKIPathSecurity) {
- return ((PKIPathSecurity) token).getX509Certificates(true, crypto);
+ return ((PKIPathSecurity) token).getX509Certificates(false, crypto);
} else if (token instanceof X509Security) {
X509Certificate cert = ((X509Security) token).getX509Certificate(crypto);
X509Certificate[] certs = new X509Certificate[1];
1.17 +1 -1 ws-fx/wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java
Index: WSSignEnvelope.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WSSignEnvelope.java 22 Jul 2004 18:31:10 -0000 1.16
+++ WSSignEnvelope.java 22 Jul 2004 21:39:48 -0000 1.17
@@ -383,7 +383,7 @@
bstToken = new PKIPathSecurity(wssConfig, doc);
((PKIPathSecurity) bstToken).setX509Certificates(
certs,
- true,
+ false,
crypto);
} else {
bstToken = new X509Security(wssConfig, doc);
1.6 +1 -1 ws-fx/wss4j/src/org/apache/ws/security/message/token/PKIPathSecurity.java
Index: PKIPathSecurity.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/message/token/PKIPathSecurity.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PKIPathSecurity.java 22 Jul 2004 18:31:10 -0000 1.5
+++ PKIPathSecurity.java 22 Jul 2004 21:39:49 -0000 1.6
@@ -97,6 +97,6 @@
}
public static String getType(WSSConfig wssConfig) {
- return wssConfig.getWsseNS() + "#" + X509PKI_PATH;
+ return WSConstants.X509TOKEN_NS + "#" + X509PKI_PATH;
}
}