You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2016/02/29 12:35:32 UTC
svn commit: r1732869 - in /webservices/wss4j/branches/2_1_x-fixes:
ws-security-common/src/main/java/org/apache/wss4j/common/
ws-security-dom/src/main/java/org/apache/wss4j/dom/message/
ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ ws-se...
Author: coheigea
Date: Mon Feb 29 11:35:32 2016
New Revision: 1732869
URL: http://svn.apache.org/viewvc?rev=1732869&view=rev
Log:
Fixes a typo in the constant name for "RSAOAEP".
Modified:
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java Mon Feb 29 11:35:32 2016
@@ -104,9 +104,9 @@ public class WSS4JConstants {
public static final String KEYTRANSPORT_RSA15 =
"http://www.w3.org/2001/04/xmlenc#rsa-1_5";
- public static final String KEYTRANSPORT_RSAOEP =
+ public static final String KEYTRANSPORT_RSAOAEP =
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p";
- public static final String KEYTRANSPORT_RSAOEP_XENC11 =
+ public static final String KEYTRANSPORT_RSAOAEP_XENC11 =
"http://www.w3.org/2009/xmlenc11#rsa-oaep";
public static final String TRIPLE_DES =
"http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java Mon Feb 29 11:35:32 2016
@@ -93,7 +93,7 @@ public class WSSecEncryptedKey extends W
/**
* Algorithm used to encrypt the ephemeral key
*/
- private String keyEncAlgo = WSConstants.KEYTRANSPORT_RSAOEP;
+ private String keyEncAlgo = WSConstants.KEYTRANSPORT_RSAOAEP;
/**
* Algorithm to be used with the ephemeral key
@@ -247,15 +247,15 @@ public class WSSecEncryptedKey extends W
Cipher cipher = KeyUtils.getCipherInstance(keyEncAlgo);
try {
OAEPParameterSpec oaepParameterSpec = null;
- if (WSConstants.KEYTRANSPORT_RSAOEP.equals(keyEncAlgo)
- || WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(keyEncAlgo)) {
+ if (WSConstants.KEYTRANSPORT_RSAOAEP.equals(keyEncAlgo)
+ || WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(keyEncAlgo)) {
String jceDigestAlgorithm = "SHA-1";
if (digestAlgo != null) {
jceDigestAlgorithm = JCEMapper.translateURItoJCEID(digestAlgo);
}
MGF1ParameterSpec mgf1ParameterSpec = new MGF1ParameterSpec("SHA-1");
- if (WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(keyEncAlgo)) {
+ if (WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(keyEncAlgo)) {
if (WSConstants.MGF_SHA224.equals(mgfAlgo)) {
mgf1ParameterSpec = new MGF1ParameterSpec("SHA-224");
} else if (WSConstants.MGF_SHA256.equals(mgfAlgo)) {
@@ -709,7 +709,7 @@ public class WSSecEncryptedKey extends W
digestElement.setAttributeNS(null, "Algorithm", digestAlgo);
encryptionMethod.appendChild(digestElement);
}
- if (WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(keyEncAlgo) && mgfAlgo != null) {
+ if (WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(keyEncAlgo) && mgfAlgo != null) {
Element mgfElement =
doc.createElementNS(WSConstants.ENC11_NS, WSConstants.ENC11_PREFIX + ":MGF");
mgfElement.setAttributeNS(null, "Algorithm", mgfAlgo);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java Mon Feb 29 11:35:32 2016
@@ -297,8 +297,8 @@ public class EncryptedKeyProcessor imple
Cipher cipher = KeyUtils.getCipherInstance(encryptedKeyTransportMethod);
try {
OAEPParameterSpec oaepParameterSpec = null;
- if (WSConstants.KEYTRANSPORT_RSAOEP.equals(encryptedKeyTransportMethod)
- || WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(encryptedKeyTransportMethod)) {
+ if (WSConstants.KEYTRANSPORT_RSAOAEP.equals(encryptedKeyTransportMethod)
+ || WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(encryptedKeyTransportMethod)) {
// Get the DigestMethod if it exists
String digestAlgorithm = EncryptionUtils.getDigestAlgorithm(encryptedKeyElement);
String jceDigestAlgorithm = "SHA-1";
@@ -307,7 +307,7 @@ public class EncryptedKeyProcessor imple
}
MGF1ParameterSpec mgfParameterSpec = new MGF1ParameterSpec("SHA-1");
- if (WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(encryptedKeyTransportMethod)) {
+ if (WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(encryptedKeyTransportMethod)) {
String mgfAlgorithm = EncryptionUtils.getMGFAlgorithm(encryptedKeyElement);
if (WSConstants.MGF_SHA224.equals(mgfAlgorithm)) {
mgfParameterSpec = new MGF1ParameterSpec("SHA-224");
@@ -621,8 +621,8 @@ public class EncryptedKeyProcessor imple
// EncryptionAlgorithm must be RSA15, or RSAOEP.
if (!(WSConstants.KEYTRANSPORT_RSA15.equals(encAlgo)
- || WSConstants.KEYTRANSPORT_RSAOEP.equals(encAlgo)
- || WSConstants.KEYTRANSPORT_RSAOEP_XENC11.equals(encAlgo))) {
+ || WSConstants.KEYTRANSPORT_RSAOAEP.equals(encAlgo)
+ || WSConstants.KEYTRANSPORT_RSAOAEP_XENC11.equals(encAlgo))) {
bspEnforcer.handleBSPRule(BSPRule.R5621);
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java Mon Feb 29 11:35:32 2016
@@ -278,7 +278,7 @@ public class EncryptionAlgorithmSuiteTes
private AlgorithmSuite createAlgorithmSuite() {
AlgorithmSuite algorithmSuite = new AlgorithmSuite();
algorithmSuite.setMinimumAsymmetricKeyLength(512);
- algorithmSuite.addKeyWrapAlgorithm(WSConstants.KEYTRANSPORT_RSAOEP);
+ algorithmSuite.addKeyWrapAlgorithm(WSConstants.KEYTRANSPORT_RSAOAEP);
algorithmSuite.addEncryptionMethod(WSConstants.TRIPLE_DES);
return algorithmSuite;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Mon Feb 29 11:35:32 2016
@@ -127,7 +127,7 @@ public class EncryptionGCMTest extends o
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.AES_192_GCM);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP_XENC11);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP_XENC11);
builder.setDigestAlgorithm(WSConstants.SHA256);
builder.setMGFAlgorithm(WSConstants.MGF_SHA256);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Mon Feb 29 11:35:32 2016
@@ -126,7 +126,7 @@ public class EncryptionPartsTest extends
final List<WSDataRef> refs =
(List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
- assertEquals(WSConstants.KEYTRANSPORT_RSAOEP,
+ assertEquals(WSConstants.KEYTRANSPORT_RSAOAEP,
actionResult.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_TRANSPORT_METHOD));
WSDataRef wsDataRef = refs.get(0);
@@ -289,7 +289,7 @@ public class EncryptionPartsTest extends
final List<WSDataRef> refs =
(List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
- assertEquals(WSConstants.KEYTRANSPORT_RSAOEP,
+ assertEquals(WSConstants.KEYTRANSPORT_RSAOAEP,
actionResult.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_TRANSPORT_METHOD));
WSDataRef wsDataRef = refs.get(0);
@@ -337,7 +337,7 @@ public class EncryptionPartsTest extends
final List<WSDataRef> refs =
(List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
- assertEquals(WSConstants.KEYTRANSPORT_RSAOEP,
+ assertEquals(WSConstants.KEYTRANSPORT_RSAOAEP,
actionResult.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_TRANSPORT_METHOD));
WSDataRef wsDataRef = refs.get(0);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Mon Feb 29 11:35:32 2016
@@ -192,7 +192,7 @@ public class EncryptionTest extends org.
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
@@ -225,7 +225,7 @@ public class EncryptionTest extends org.
public void testEncryptionDecryptionPublicKey() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setKeyIdentifierType(WSConstants.KEY_VALUE);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
@@ -670,7 +670,7 @@ public class EncryptionTest extends org.
public void testEncryptionDecryptionOAEPSHA256() throws Exception {
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
builder.setDigestAlgorithm(WSConstants.SHA256);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
@@ -702,7 +702,7 @@ public class EncryptionTest extends org.
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("regexp");
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java Mon Feb 29 11:35:32 2016
@@ -136,7 +136,7 @@ public class PasswordEncryptorTest exten
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Mon Feb 29 11:35:32 2016
@@ -750,7 +750,7 @@ public class SamlTokenTest extends org.j
assertTrue(certs != null && certs.length > 0 && certs[0] != null);
encryptElement(doc, assertionElement, WSConstants.AES_128, secretKey,
- WSConstants.KEYTRANSPORT_RSAOEP, certs[0], false, true);
+ WSConstants.KEYTRANSPORT_RSAOAEP, certs[0], false, true);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -839,7 +839,7 @@ public class SamlTokenTest extends org.j
(Element)encryptedAssertionElement.getElementsByTagNameNS(WSConstants.ENC_NS, "EncryptedData").item(0);
encryptedData.setAttributeNS(null, "Id", id);
- XMLCipher newCipher = XMLCipher.getInstance(WSConstants.KEYTRANSPORT_RSAOEP);
+ XMLCipher newCipher = XMLCipher.getInstance(WSConstants.KEYTRANSPORT_RSAOAEP);
newCipher.init(XMLCipher.WRAP_MODE, certs[0].getPublicKey());
EncryptedKey encryptedKey = newCipher.encryptKey(doc, secretKey);
@@ -927,7 +927,7 @@ public class SamlTokenTest extends org.j
assertTrue(certs != null && certs.length > 0 && certs[0] != null);
encryptElement(doc, assertionElement, WSConstants.AES_128, secretKey,
- WSConstants.KEYTRANSPORT_RSAOEP, certs[0], false, false);
+ WSConstants.KEYTRANSPORT_RSAOAEP, certs[0], false, false);
if (LOG.isDebugEnabled()) {
String outputString =
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1732869&r1=1732868&r2=1732869&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Mon Feb 29 11:35:32 2016
@@ -913,7 +913,7 @@ public class SAMLTokenTest extends Abstr
assertTrue(certs != null && certs.length > 0 && certs[0] != null);
encryptElement(doc, assertionElement, WSConstants.AES_128, secretKey,
- WSConstants.KEYTRANSPORT_RSAOEP, certs[0], false);
+ WSConstants.KEYTRANSPORT_RSAOAEP, certs[0], false);
javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(baos));