Guest User

Untitled

a guest
Apr 1st, 2011
152
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.85 KB | None | 0 0
  1. Index: modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
  2. ===================================================================
  3. --- modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java (revision 1087574)
  4. +++ modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java (working copy)
  5. @@ -240,6 +240,8 @@
  6. public final static String HMAC_SHA1 = "http://www.w3.org/2000/09/xmldsig#hmac-sha1";
  7.  
  8. public final static String RSA_SHA1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
  9. +
  10. + public final static String RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
  11.  
  12. public final static String SHA1 = "http://www.w3.org/2000/09/xmldsig#sha1";
  13.  
  14. Index: modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
  15. ===================================================================
  16. --- modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (revision 1087574)
  17. +++ modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (working copy)
  18. @@ -289,6 +289,9 @@
  19. * @return Returns the asymmetricSignature.
  20. */
  21. public String getAsymmetricSignature() {
  22. + if(this.digest == SPConstants.SHA256) {
  23. + return SPConstants.RSA_SHA256;
  24. + }
  25. return asymmetricSignature;
  26. }
  27.  
  28. Index: modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
  29. ===================================================================
  30. --- modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (revision 1087574)
  31. +++ modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (working copy)
  32. @@ -83,7 +83,7 @@
  33. "Unlimited Strength Jurisdiction Policy !!!");
  34. }
  35.  
  36. - for (int i = 1; i <= 32; i++) { //<-The number of tests we have
  37. + for (int i = 3; i <= 3; i++) { //<-The number of tests we have
  38. if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
  39. //Skip the Basic256 tests
  40. continue;
  41. Index: modules/rampart-integration/src/test/resources/rampart/services-3.xml
  42. ===================================================================
  43. --- modules/rampart-integration/src/test/resources/rampart/services-3.xml (revision 1087574)
  44. +++ modules/rampart-integration/src/test/resources/rampart/services-3.xml (working copy)
  45. @@ -40,7 +40,7 @@
  46. </sp:RecipientToken>
  47. <sp:AlgorithmSuite>
  48. <wsp:Policy>
  49. - <sp:Basic128/>
  50. + <sp:Basic256Sha256/>
  51. </wsp:Policy>
  52. </sp:AlgorithmSuite>
  53. <sp:Layout>
  54. Index: modules/rampart-integration/src/test/resources/rampart/policy/3.xml
  55. ===================================================================
  56. --- modules/rampart-integration/src/test/resources/rampart/policy/3.xml (revision 1087574)
  57. +++ modules/rampart-integration/src/test/resources/rampart/policy/3.xml (working copy)
  58. @@ -23,7 +23,7 @@
  59. </sp:RecipientToken>
  60. <sp:AlgorithmSuite>
  61. <wsp:Policy>
  62. - <sp:Basic128/>
  63. + <sp:Basic256Sha256/>
  64. </wsp:Policy>
  65. </sp:AlgorithmSuite>
  66. <sp:Layout>
  67. Index: modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
  68. ===================================================================
  69. --- modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (revision 1087574)
  70. +++ modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (working copy)
  71. @@ -728,6 +728,7 @@
  72. }
  73.  
  74. try {
  75. + sig.setDigestAlgo(rpd.getAlgorithmSuite().getDigest());
  76. sig.addReferencesToSign(sigParts, rmd.getSecHeader());
  77. sig.computeSignature();
Advertisement
Add Comment
Please, Sign In to add comment