cvs commit: ws-fx/wss4j/src/org/apache/ws/security/handler WSS4JHandler.java

dims        2004/08/17 23:54:46

  Modified:    wss4j/src/org/apache/ws/security/handler WSS4JHandler.java
  Log:
  decode signature parts and set the token type.
  
  Revision  Changes    Path
  1.2       +30 -1     
ws-fx/wss4j/src/org/apache/ws/security/handler/WSS4JHandler.java
  
  Index: WSS4JHandler.java
  ===================================================================
  RCS file: 
/home/cvs/ws-fx/wss4j/src/org/apache/ws/security/handler/WSS4JHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSS4JHandler.java 12 Aug 2004 17:42:09 -0000      1.1
  +++ WSS4JHandler.java 18 Aug 2004 06:54:45 -0000      1.2
  @@ -279,7 +279,6 @@
            * may be used for encryption too.
            */
           if ((doAction & WSConstants.SIGN) == WSConstants.SIGN) {
  -            sigCrypto = loadSignatureCrypto();
               decodeSignatureParameter();
           }
           /*
  @@ -962,6 +961,36 @@
            * here, but we call the load crypto hook rather than just changing 
the visibility
            * of this method to maintain parity with WSS4JHandler.
            */
  +
  +        String tmpS = null;
  +        if ((tmpS = (String) 
handlerInfo.getHandlerConfig().get(WSHandlerConstants.SIG_KEY_ID)) == null) {
  +            tmpS = (String) 
msgContext.getProperty(WSHandlerConstants.SIG_KEY_ID);
  +        }
  +        if (tmpS != null) {
  +            Integer I = (Integer) WSHandlerConstants.keyIdentifier.get(tmpS);
  +            if (I == null) {
  +                throw new JAXRPCException("WSS4JHandler: Signature: unknown 
key identification");
  +            }
  +            sigKeyId = I.intValue();
  +            if (!(sigKeyId == WSConstants.ISSUER_SERIAL
  +                    || sigKeyId == WSConstants.BST_DIRECT_REFERENCE
  +                    || sigKeyId == WSConstants.X509_KEY_IDENTIFIER
  +                    || sigKeyId == WSConstants.SKI_KEY_IDENTIFIER)) {
  +                throw new JAXRPCException("WSS4JHandler: Signature: illegal 
key identification");
  +            }
  +        }
  +        if ((sigAlgorithm = (String) 
handlerInfo.getHandlerConfig().get(WSHandlerConstants.SIG_ALGO))
  +                == null) {
  +            tmpS = (String) 
msgContext.getProperty(WSHandlerConstants.SIG_ALGO);
  +        }
  +        if ((tmpS = (String) 
handlerInfo.getHandlerConfig().get(WSHandlerConstants.SIGNATURE_PARTS))
  +                == null) {
  +            tmpS =
  +                    (String) 
msgContext.getProperty(WSHandlerConstants.SIGNATURE_PARTS);
  +        }
  +        if (tmpS != null) {
  +            splitEncParts(tmpS, signatureParts);
  +        }
       }
   
       /*