[WSS4J] wss4j/src/org/apache/ws/security/message WSEncryptBody.java,1.28,1.29 WSSignEnvelope.java,1.26,1.27
[email protected] Thu, 05 Feb 2004 10:28:38 -0800
| Newsgroups | gmane.text.xml.wss4j |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20391/src/org/apache/ws/security/message
Modified Files:
WSEncryptBody.java WSSignEnvelope.java
Log Message:
Checking in code that was "lost" during the sf.net CVS corruption. (Thanks Jason for finding the problem and sending me the cvs commit emails)
Index: WSEncryptBody.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message/WSEncryptBody.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** WSEncryptBody.java 21 Jan 2004 13:21:37 -0000 1.28
--- WSEncryptBody.java 5 Feb 2004 18:28:35 -0000 1.29
***************
*** 343,347 ****
*/
X509Certificate remoteCert = null;
! remoteCert = crypto.getCertificates(user)[0];
if (tlog.isDebugEnabled()) {
t2 = System.currentTimeMillis();
--- 343,352 ----
*/
X509Certificate remoteCert = null;
! X509Certificate[] certs = crypto.getCertificates(user);
! if (certs == null || certs.length <= 0) {
! throw new WSSecurityException(WSSecurityException.FAILURE,
! "invalidX509Data", new Object[]{"for Encryption"});
! }
! remoteCert = certs[0];
if (tlog.isDebugEnabled()) {
t2 = System.currentTimeMillis();
Index: WSSignEnvelope.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** WSSignEnvelope.java 21 Jan 2004 13:21:37 -0000 1.26
--- WSSignEnvelope.java 5 Feb 2004 18:28:35 -0000 1.27
***************
*** 200,204 ****
X509Certificate[] certs = crypto.getCertificates(user);
! if (certs.length <= 0) {
throw new WSSecurityException(WSSecurityException.FAILURE,
"invalidX509Data", new Object[]{"for Signature"});
--- 200,204 ----
X509Certificate[] certs = crypto.getCertificates(user);
! if (certs == null || certs.length <= 0) {
throw new WSSecurityException(WSSecurityException.FAILURE,
"invalidX509Data", new Object[]{"for Signature"});
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn