svn commit: r1531411 - in /cxf/trunk/rt/rs/security: sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java

[dkulp]

Author: dkulp
Date: Fri Oct 11 20:27:32 2013
New Revision: 1531411

URL: http://svn.apache.org/r1531411
Log:
Fix compile failures

Modified:
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
    
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java?rev=1531411&r1=1531410&r2=1531411&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
 Fri Oct 11 20:27:32 2013
@@ -44,12 +44,12 @@ import org.apache.wss4j.common.ext.WSSec
 import org.apache.wss4j.common.saml.SAMLKeyInfo;
 import org.apache.wss4j.common.saml.SAMLUtil;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.wss4j.dom.validate.Credential;
 import org.apache.wss4j.dom.validate.SamlAssertionValidator;
 import org.apache.wss4j.dom.validate.SignatureTrustValidator;
@@ -507,7 +507,7 @@ public class SAMLProtocolResponseValidat
     private byte[] decryptPayload(
         Element root, byte[] secretKeyBytes, String symEncAlgo
     ) throws WSSecurityException {
-        SecretKey key = WSSecurityUtil.prepareSecretKey(symEncAlgo, 
secretKeyBytes);
+        SecretKey key = KeyUtils.prepareSecretKey(symEncAlgo, secretKeyBytes);
         try {
             XMLCipher xmlCipher = 
                 EncryptionUtils.initXMLCipher(symEncAlgo, 
XMLCipher.DECRYPT_MODE, key);

Modified: 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java?rev=1531411&r1=1531410&r2=1531411&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
 (original)
+++ 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
 Fri Oct 11 20:27:32 2013
@@ -44,8 +44,8 @@ import org.apache.cxf.staxutils.W3CDOMSt
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.xml.security.encryption.XMLCipher;
 import org.apache.xml.security.encryption.XMLEncryptionException;
 import org.apache.xml.security.utils.Constants;
@@ -258,7 +258,7 @@ public abstract class AbstractXmlEncInHa
     protected byte[] decryptPayload(Element root, 
                                     byte[] secretKeyBytes,
                                     String symEncAlgo) throws 
WSSecurityException {
-        SecretKey key = WSSecurityUtil.prepareSecretKey(symEncAlgo, 
secretKeyBytes);
+        SecretKey key = KeyUtils.prepareSecretKey(symEncAlgo, secretKeyBytes);
         try {
             XMLCipher xmlCipher = 
                 EncryptionUtils.initXMLCipher(symEncAlgo, 
XMLCipher.DECRYPT_MODE, key);