[WSS4J] wss4j/src/org/apache/ws/axis/security WSDoAllConstants.java,1.7,1.8 WSDoAllSender.java,1.21,1.22

Update of /cvsroot/wss4j/wss4j/src/org/apache/ws/axis/security
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10700/src/org/apache/ws/axis/security

Modified Files:
	WSDoAllConstants.java WSDoAllSender.java 
Log Message:
Add some functions to support SKI KeyIdentifier. Not tested yet, but
doesn't break existing functions.

Index: WSDoAllConstants.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/axis/security/WSDoAllConstants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- WSDoAllConstants.java	22 Dec 2003 13:36:11 -0000	1.7
+++ WSDoAllConstants.java	13 Feb 2004 16:11:04 -0000	1.8
@@ -621,6 +621,10 @@
 		keyIdentifier.put(
 			"EmbeddedKeyName",
 			new Integer(WSConstants.EMBEDDED_KEYNAME));
+		keyIdentifier.put(
+			"SKIKeyIdentifierDirect",
+			new Integer(WSConstants.SKI_KEY_IDENTIFIER_DIRECT));
+
 	}
 
 }

Index: WSDoAllSender.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/axis/security/WSDoAllSender.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- WSDoAllSender.java	10 Feb 2004 21:13:12 -0000	1.21
+++ WSDoAllSender.java	13 Feb 2004 16:11:04 -0000	1.22
@@ -484,7 +484,9 @@
 			sigKeyId = I.intValue();
 			if (!(sigKeyId == WSConstants.ISSUER_SERIAL
 				|| sigKeyId == WSConstants.BST_DIRECT_REFERENCE
-				|| sigKeyId == WSConstants.X509_KEY_IDENTIFIER)) {
+				|| sigKeyId == WSConstants.X509_KEY_IDENTIFIER
+				|| sigKeyId == WSConstants.SKI_KEY_IDENTIFIER
+				|| sigKeyId == WSConstants.SKI_KEY_IDENTIFIER_DIRECT)) {
 				throw new AxisFault("WSDoAllSender: Signature: illegal key identification");
 			}
 		}



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click