From e4b4cb2124f5df641d3a83437acee90206e4b905 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 29 Feb 2008 01:31:38 +0000
Subject: [PATCH] SWS-301

---
 .../ws/soap/security/wss4j/encrypted-soap.xml |  37 ++++++++++--------
 .../ws/soap/security/wss4j/signed-soap.xml    |  24 ++++++------
 security/src/test/resources/private.jks       | Bin 1827 -> 1807 bytes
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
index cc711209..c4f2315c 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><SOAP-ENV:Header>
-<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><xenc:EncryptedKey Id="EncKeyId-25488452" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">
-<xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<wsse:SecurityTokenReference xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509IssuerSerial xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509IssuerName xmlns:ds="http://www.w3.org/2000/09/xmldsig#">CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown</ds:X509IssuerName>
-<ds:X509SerialNumber xmlns:ds="http://www.w3.org/2000/09/xmldsig#">1196367787</ds:X509SerialNumber>
-</ds:X509IssuerSerial>
-</ds:X509Data></wsse:SecurityTokenReference>
-</ds:KeyInfo>
-<xenc:CipherData><xenc:CipherValue>CtuWCgHBFl1zHdRU70e4aPoRwpMH8GMzWKmywSxdrMz4dS+hOexUu8sY2SUl0jdO+IfL/oNYj4eic7G6utkddKeOCHM8Rj7gtr2Elol2q1ZHXc5N1DUk99t7dYs+XmMU2ULqyGh0T0rmhbABmbxZDB4NzwCBFvXxEUUFFBbN460=</xenc:CipherValue></xenc:CipherData>
-<xenc:ReferenceList><xenc:DataReference URI="#EncDataId-22297736"/></xenc:ReferenceList></xenc:EncryptedKey></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body><xenc:EncryptedData Id="EncDataId-22297736" Type="http://www.w3.org/2001/04/xmlenc#Content" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"/><xenc:CipherData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><xenc:CipherValue xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">pqzkZJz0/RdUsf8y1z04PvWv48lYtrfmskeW8304PtXD2lXS2iGva5SlL7vc96aA6915zzyld4O0
-c+0ISwgvHnharmwatlih/kGfHNY0/LBDidzsbbjrsMWFiq3MLy3x9Sj79pHnChd2BSw9D49kgtUN
-W8uIAUxLlsPqdSst9hEq/RYUk0M6mx8HBy2DnE3t36ifrB/1QnY4ohQoMrBARu4HIWidCxhajFSX
-i1ZNX8ff4RrD3JUoAlDX6J5zj3+YfxtaaZhoMXRshxAhJwoLidKGlFKN6gsZXqorDJ8ETZ6SdCJ3
-O2f4c+WW1xQLUdvt</xenc:CipherValue></xenc:CipherData></xenc:EncryptedData></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><SOAP-ENV:Header>
+<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><xenc:EncryptedKey Id="EncKeyId-urn:uuid:8DDF426E79084C559F12042485592464">
+<xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"></xenc:EncryptionMethod>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<wsse:SecurityTokenReference><ds:X509Data>
+<ds:X509IssuerSerial>
+<ds:X509IssuerName>CN=Unknown,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown</ds:X509IssuerName>
+
+<ds:X509SerialNumber>1204234455</ds:X509SerialNumber>
+</ds:X509IssuerSerial>
+</ds:X509Data></wsse:SecurityTokenReference>
+</ds:KeyInfo>
+<xenc:CipherData><xenc:CipherValue>gqgcmkwA9dsfFQNyt8V+ztLMCMy7DZ/DbQ3Yrt3XSh8E9qVBwrZmWV5LUw2qrxpcTCYQK3NK4kuc9IVedAF3PzKiYKOWG/fN01Cpk63vVUox6gqp9N4DZRSkfvxVbuxzUdyrsvn+WUYPKjpHFbQdvSzduydPgrleLBFodl021Lk=</xenc:CipherValue></xenc:CipherData>
+<xenc:ReferenceList><xenc:DataReference URI="#EncDataId-1174947815"></xenc:DataReference></xenc:ReferenceList></xenc:EncryptedKey></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body><xenc:EncryptedData Id="EncDataId-1174947815" Type="http://www.w3.org/2001/04/xmlenc#Content"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"></xenc:EncryptionMethod><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<wsse:SecurityTokenReference xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Reference URI="#EncKeyId-urn:uuid:8DDF426E79084C559F12042485592464"></wsse:Reference></wsse:SecurityTokenReference>
+</ds:KeyInfo><xenc:CipherData><xenc:CipherValue>HrhKCP62Qn2yxsu4CKsTyNoMxJuXQji6uubgMlYD1j/+kLEfUZwlzWYvu1hHW2nnjZI2LDoMaktE
+SUlbafeejM9JJ7LNaTSs0dzzpjhmbm0a8E5i0B+Fth62zHB8L4fZZVYVDqLUn37CQTGASTVJDt94
+NJRF/Fk0JPyW32iCRpPvrwaJzw/45mkYMaqPsvvcj7VKr4EoH96d2ilRENZXuIE6MiR+nBmyfdgl
+21Mv8q04uwCTWBykDqrk95QG07sXInAsp98rTR6kmU+8ntftEVpTGP9TEMQ+7SaXHXH2U3IqITo0
+e5dCizixVlotEn+X</xenc:CipherValue></xenc:CipherData></xenc:EncryptedData></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
index 24c94297..d36a5fde 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header>
-<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-30541453">
+<wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" SOAP-ENV:mustUnderstand="1"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-13673945">
 <ds:SignedInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
-<ds:Reference URI="#id-7237831" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:Reference URI="#id-32487478" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:Transforms xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
-<ds:DigestValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">I6X9SMGsJ5sOBL5NUM4H3KMTpc8=</ds:DigestValue>
+<ds:DigestValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">70oDCsbAmt7qauS7FmUvB7oVDfM=</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-DX4XwuzPSkwTXIPKTWKXXf05PWssJjkFUVxg8Joj4OmB6yqDzzTJ1GHRI/3PFZLjoUQq7dL4JqAL
-BjcD2lb9ka0c/EILe59QtD1USz1jM8i/zAtNDv3J38yIIHeAp+v/zdT8cNAvG+unwpJvAYMaS34j
-mziXbS3/NLMFkroYR3Q=
+lUrzlFJIz4SRTf+qP9zPZr0s9tN+Suu+XJ2iwVwSMoJIfw+1YQSnWrQZD7EctacGN8iAHqP5g/LK
+mXtOw0Ar03uwjoeUBqmchcIjWZjyYYmvtTDF9VA70z07C4zp7FYAP7GLKVCb4hmFn81mHLhWYlo7
+2bQEpkIOjaC5IBoFiLI=
 </ds:SignatureValue>
-<ds:KeyInfo Id="KeyId-23710309" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<wsse:SecurityTokenReference xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="STRId-970341" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:KeyInfo Id="KeyId-30426707" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<wsse:SecurityTokenReference xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="STRId-28145575" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><ds:X509Data xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:X509IssuerSerial xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509IssuerName xmlns:ds="http://www.w3.org/2000/09/xmldsig#">CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown</ds:X509IssuerName>
-<ds:X509SerialNumber xmlns:ds="http://www.w3.org/2000/09/xmldsig#">1196367787</ds:X509SerialNumber>
+<ds:X509IssuerName xmlns:ds="http://www.w3.org/2000/09/xmldsig#">CN=Unknown,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown</ds:X509IssuerName>
+
+<ds:X509SerialNumber xmlns:ds="http://www.w3.org/2000/09/xmldsig#">1204234455</ds:X509SerialNumber>
 </ds:X509IssuerSerial>
 </ds:X509Data></wsse:SecurityTokenReference>
 </ds:KeyInfo>
-</ds:Signature></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="id-7237831"><tns:echoRequest xmlns:tns="http://www.springframework.org/spring-ws/samples/echo">Hello</tns:echoRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
+</ds:Signature></wsse:Security></SOAP-ENV:Header><SOAP-ENV:Body xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" wsu:Id="id-32487478"><tns:echoRequest xmlns:tns="http://www.springframework.org/spring-ws/samples/echo">Hello</tns:echoRequest></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/security/src/test/resources/private.jks b/security/src/test/resources/private.jks
index 679548732a62c17f11b0d21bf818acf5ef49f6b7..b3b10e36f8eb4b106279725d60034bdd9ebc4388 100644
GIT binary patch
delta 1308
zcmV+%1>^do4v!9y9t9X-`v2yUBj|rOZc}Q-8ZZ9>0Tgv{0Db@k0001xqCN8!uHQX2
z@Z!Im8GG~>jte`Ev#*vhd>J;8TxQ+nw-lmexBqb-;vT?}X3zHLtlazEWb`R>@k!D|
z<Z*fiEgfra+cj@vKicEB9=R;mU?;E2ox~dS>tK;W@v6!TPm<KuqTQI5--{*@q1_FY
zVCe%9b!AYUjiOQJoO;377jfo-JO#ZuLoXO<!H7WzWRtJ~L4O!w_lgz(00N{if&!p0
z8U_g~1_1;CDgqM$FbxC<zJ^{MjqQ{;0s#~Rf&zfayZeF-EHEmXwxvE`tCSKCW%L?F
zp@Xz)rzMeQKl9>jFq21_SXnNNVYsE9V-HQ6z~QHO$1O}=a&bAvm@rE;f3Kmo$v3UB
z_z||tEaS-McYmxtU^!A}<ytCM#`Qlw_?x0WL0l*poqom8tMU>;-V1|(=GP+2!OE7|
zX?^bQ<Rpbb`Ep2$b+w@^jtI8xwoaMKvMB}6_?PPnUj2lxC-A{xXPd1^OL~w@4K(j7
zc0`!Y_2b4v88G4Y&NlzBC8b{kGNfqH=W86&6Q_)Ee1B#kFctvdKwauGkL%f&Z6CR+
zs^L}#>b$}f$L*S2+BX+4mWoIF6p!FnWNyh!s8yeUi-BJP;Wk-1OP-D+w6~F2><TNP
z)Pn`d=QN5WwMzKHa?WEfmPh?%#;#;ee%3g3oG1NawZ|M7KxZ%?jl~_K)F*jXllp>|
z;^zicPk;DKhdcyl847WsfzNxAjN~?_6WaI&7{XX{f28{zkO&YPjPK`ugZ9i)VT)`u
zjqvmPo{n|$w5rXt@+0}Z2u%Ca;g$&8(I&UKYV320HY3IfMm0MwF=DjX`%?8u9xDrR
zY6#7q$r)xOh3&}%9ea*vX8qp2L*v~0$q5dbP=D8mMLM94_fkGs6V7;nTnwwSrg+2A
zRrDjW?ci4Q4y+={4CXm3$jB2&?R9=l@?%35`!19V7%A);zk8UU;ovC0bv;ay!dimA
z<91*5A+}1+O$#<B3jxxo8T+b~Lq_RkkS_O$^s~=T4TSH%6hoGJGQqR)QxNAik>a$5
z-e8V&ctR#UOCQRcV`2Ip@m?&p&>r(i{w*G4^4m9^8e)q9+Vk)Dy@qq2PRJU<ryTc@
z0000100mesH842<00K@hf&xk~f&sGv1V_gx*DwtR2`Yw2hW8Bt0R#mAFl>`=1zR%^
zFb)O-RRjYQ2UTusZf|#PFdi2TFgP$WGB`3ZGc++ZS{Ds7H83|ZH8L?XG%+<=Fl>`=
z1zQmiFb)O-RRjYQ2UTusZf|#PliCFxf1%ey5qQoRi!lrUH1}6s2A-zTa+&pH$x^X=
zHkjHHgo<Mu5~`ch6-+B8cJ@vL=Y&SmCS#@5WhyqY83B$|l)<omH`M|EMx7RDR|GF(
z#W)MU_`Pm{-wVa#2Phx(KCQtoM{b3(A*qN|y^qniVaFWD@TseLLVaUC^z1CSf58F+
z0RRCo4F(A+hDe6@4FLfJ1potqfdEWwMWB=+1$_k1H=cITuyHlQs7vA%A)-5RY_Th4
z&u{yB^aUyB<-O-UkeLmo*pn<=Yx}dsZrwokLp2g<prpi5d)eYW_kek&!5B`Xcqz%j
zms{W3k8?_mBKtL(JXmaRdYNbvE=y23z59JnDpVJ}*3w-Q1yocifMo^d;5l47x?6(U
S8t_%3cla;+BqsjicB()AoKhkH

delta 1361
zcmV-X1+My!4x<i`9t9U(MmEclBj|t7Wo%dD5o#*}0Tgv{0Db@k0001xxM}37AuA1^
za*v~?!&<;j?(*c<D*8E?4lI>BD7dj}Hm>2|)=HMV6{C-~g;1J;oH)jW3SUdRpD2VU
z6v;KcrFN94Qk5!J`L1#mkQ_q&`~j_qqFQbu*Gj;aya|FI?DMvomKR8h0tzO6Zmox+
zIA>AVE`h+&iq{6UNhY!7HG9M!!*rnIadnR>*Yx8u?31toL4OvF6S`Lb00O!&f&#WM
z4h9M<1_1;CDgqG!0R;dAf&!vfeQnBWKJ9M?GL<Ds2&Yn8R_fcvu~(U&V+^a?DdviC
zxBov6x4}@A257($JCvVzC_{B^|3`NQD1-Vi0;#M1w(6G8jHtI#Emi`GeR!O(&{Mn3
z$6tUK28NwuwSWAKzVNx8w;*PVwl{}1tRYJqg#A$w)6YoTcUoa%3U1%_bFKU!IE8Ii
zc8NE0kwR`k5LZxXf}V1@Eyz7Nqd-k~>73wNW$gyzH2!v&MWPss1|c#F#6NLN`qKO^
zbsKw0<39KX_`&p<VbWfOhf4{-p-jp~9G`!GbL&RI>wl&L;jWl-caWkX^_(eIZ632k
zhH4@Fe=YheY-Xgvu(|-H^9RcWA_wVJj}@~<MUORH6oYf&-kAvvbm>i97pd-qdMxYm
zM@chG@wVv<iob1<%V_9bF=bC&IeO$6u7k+zv3XOUrs%6#YXY=!R`%be4BF!JZK(ws
z#}M92+<zYe+7<8>@F~^wszu5#?1OrT18X)^iLh5XzYTc1ZN|2o{7l47g*vxUVXMN;
zNFL+QcfR_N(UvdQOD90tlcJeFolQ?2{<E1NOf|$G=vW0K*pIipc;62Xv)N$i*QU$H
z>_6`3W#BGxgtFZ)NH<YE+13O_6SO{V$%GT@ihol(YAItqHN`h>{W(L0oHGsS3biGm
z(D4oxK9~FA7TZgEh>R7uyClj8Q9(_*(ETmLs1%jMCqN~-D_`NzL|qf5=HW-b=v+|^
zxhfZ5g5uTy=DOoZqPGLk3u@B)FNR1LlAc=qDwI7GMwk&z_6s+l@vsiQPcxNJ!++eV
zihrdiGH}|;u0wII4q2(hD9E68oYVj_#BSCNHx8zQohB_rJItpnVWFdQ%MVWZEc4aV
zK=&I+LP9vYQq`^>K&>=wn|w#dy-ffB00966SS~d%IRF3xOfZ51NHBr{u>u4~Pamr=
z4F(A+hDe6@4FLfJ1pqK>F%U2g1_M<D29wnUQZf%P4F&^M1OpQWV{B<<Zgemn7Y#5s
zF)=bZGB7eTFgIEk4KO$`GBP(ZFfubRH(D@jlgtELe-AJX1_M<D0}}>gY-wd~bTEOR
zFbxI?Duzgg_YDC70R;d9fsFt#fr$cvfdHGzf7@I#1Drwd(QR@~hyS~iB(@GN`?r4}
z!<-o4CK(45moXC3%%Zowzg?$6Co-jR-DF8B4sl0TmtQ-<6e~$mtsG<#CtCGEfqa!T
zYV{LhfA%ne#{!r5=DH8C(DS29xe_O1>9#%d9tFb+eD;6x6r6TkpKd$v;b8VK08uvr
z0|5X5FbxI?Duzgg_YDC71O)&Cfq?)j%6kc8ziF-B$~euwU|@$DLUZKmK3+GBm_OJ~
zwiHxFM@Izs-~oV*R{%b+s>VWGaD%BY_XRQhTNJ^!`5!kU^u)Y2&z*Inp#=wiI|V5<
zX+thP4QX}r@jBITFY5J%dTe_nSV@l65`%eB0hFj_laA{xuG||2#9y`{p1k7@MHh<d
T{*wvQfgWPBDQ{*LIFgY!xVBK$