Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
- ===================================================================
- --- modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java (revision 1087574)
- +++ modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java (working copy)
- @@ -240,6 +240,8 @@
- public final static String HMAC_SHA1 = "http://www.w3.org/2000/09/xmldsig#hmac-sha1";
- public final static String RSA_SHA1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
- +
- + public final static String RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
- public final static String SHA1 = "http://www.w3.org/2000/09/xmldsig#sha1";
- Index: modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
- ===================================================================
- --- modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (revision 1087574)
- +++ modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (working copy)
- @@ -289,6 +289,9 @@
- * @return Returns the asymmetricSignature.
- */
- public String getAsymmetricSignature() {
- + if(this.digest == SPConstants.SHA256) {
- + return SPConstants.RSA_SHA256;
- + }
- return asymmetricSignature;
- }
- Index: modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
- ===================================================================
- --- modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (revision 1087574)
- +++ modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (working copy)
- @@ -83,7 +83,7 @@
- "Unlimited Strength Jurisdiction Policy !!!");
- }
- - for (int i = 1; i <= 32; i++) { //<-The number of tests we have
- + for (int i = 3; i <= 3; i++) { //<-The number of tests we have
- if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
- //Skip the Basic256 tests
- continue;
- Index: modules/rampart-integration/src/test/resources/rampart/services-3.xml
- ===================================================================
- --- modules/rampart-integration/src/test/resources/rampart/services-3.xml (revision 1087574)
- +++ modules/rampart-integration/src/test/resources/rampart/services-3.xml (working copy)
- @@ -40,7 +40,7 @@
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- - <sp:Basic128/>
- + <sp:Basic256Sha256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- Index: modules/rampart-integration/src/test/resources/rampart/policy/3.xml
- ===================================================================
- --- modules/rampart-integration/src/test/resources/rampart/policy/3.xml (revision 1087574)
- +++ modules/rampart-integration/src/test/resources/rampart/policy/3.xml (working copy)
- @@ -23,7 +23,7 @@
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- - <sp:Basic128/>
- + <sp:Basic256Sha256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- Index: modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
- ===================================================================
- --- modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (revision 1087574)
- +++ modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (working copy)
- @@ -728,6 +728,7 @@
- }
- try {
- + sig.setDigestAlgo(rpd.getAlgorithmSuite().getDigest());
- sig.addReferencesToSign(sigParts, rmd.getSecHeader());
- sig.computeSignature();
Advertisement
Add Comment
Please, Sign In to add comment