From 72d0327a725e6a4060b78e0887d0fddfe449e2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20M=C3=BCltin?= Date: Mon, 14 Dec 2015 17:09:14 +0100 Subject: [PATCH] Addresses #3 "SignedInfo tag namespace issue": A new check for the type SignedInfoType to get the correct namespace deals with this issue Tested with updated keystores and certificates --- RISE-V2G-EVCC/evccKeystore.jks | Bin 3325 -> 3312 bytes RISE-V2G-EVCC/evccTruststore.jks | Bin 540 -> 539 bytes RISE-V2G-SECC/contractCert.p12 | Bin 2101 -> 2101 bytes RISE-V2G-SECC/provServiceCert.p12 | Bin 2141 -> 2133 bytes RISE-V2G-SECC/seccKeystore.jks | Bin 1711 -> 1705 bytes RISE-V2G-SECC/seccTruststore.jks | Bin 1044 -> 1040 bytes .../risev2g/shared/utils/MiscUtils.java | 11 +++++++++-- .../risev2g/shared/utils/SecurityUtils.java | 2 +- 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/RISE-V2G-EVCC/evccKeystore.jks b/RISE-V2G-EVCC/evccKeystore.jks index 307ccab7c4884ac9b4216bb5d73e82dd064b05f9..b95a5e530bec2ea39912be679f7f5a4281413a06 100644 GIT binary patch literal 3312 zcmezO_TO6u1_mZ5W@O;aPtA=lD9SI3Pfjf=VPIekTxj&G87O_ipz){y9~+l88zT#& z7Ly<&BP#<-(_x0JV}kjWmW#7)Etj(R^fn|SVqQK++_%~G2Q+`BT(i(J_AY%Yd${xK zlavk>wHYi6RTrN!G4w8%-FM5t%iQuw^=a3F*Lx$>c5OOgs#YJp``4UQ%gxISOy+W@d2RG-3r0v#M-fbZE_hb57kI-cnu5QlzpXmer!py)Lp=WAf z3H06-gC@ocKwQ3nnTe5!iIKyAlZ{=g&EuRc3!_1xp^$+98*?ZNGY_Y~t8Z{=l998c zp`?L0NQ{d|AjmV=RUypCT_K<-KPxr4#E=`P8z{vl%;e%~C~P3e#>F{Ft#k4xofJk% zF=n6<26E!OhNgx_h9-ulrX~iKQ9!Plfe}yu!Zips6fqEjSji1k4>Y*U85j|iSsG~| z4D}QfBO3?Ucg&3J%uWm}uUVbamF!tGj{JzLnf9~STHj*DPKP!9$M1{h=Bu#1N?fP2 zUTt4r^G$R10_9(9zb!6BuC6)qdf%a7HLb4(JDIf>+Z)&#@BrN_E6m9FpM}YQ0hmUB zJbn<5g_()D!$20q=VK9L5fQuSY`1%nvhET&X0>X$Q{unk0ws}xo7scGz?Dgn;rCl5 zojDm&MyYpe%T~|rnqZo>^09zbM~mH-oIswUp3_VUR@UbqEG}1TY%@r=9IaI?E2{DwQ&wC(l$R2Ke@u6->>n%BH`ZU*Je9s zDNg#MW$iPmT50NHR|98oVuVC4hXETfR+$*lqL`5lDT;SYx+9s&=gE*T-Rt$V6OTfE zo$ca93UXK!FDh*G+AkLSrsm~DtxHam%Kq<3QZx-~OD&JP|{;`4i86~v{?@*rkswavbwQJNH-?+m%pS|$M8he?pvej1u z76_f0xy|a~^$$3rm=QG>qeSr(mP1xqFIgB@-c~ER9FVBxG}*xqDac__yr*T?rf-gC zE1#WQyIk$_Zab|i)lm8C4@%0oBDv>S2|Q*}P&hW@OF>zN&nA_YG8eooS#=xl$czCsE;iB&jF?C4Qer}qwGm@G~V_0Kb)?y1wgle!X|)e{bGp2eSK z{yo5WU%aHiJCo1($BK(yJl^;(Lg`xlwcIb)Y)_OpY<|Vr@Iszpp<>4Ai1Q+-)yOqq z8FLAUE1~5K4^oI2_!|lu@I%UU4qtx~YY|Wlgj|a-`TAq4M9h&(nQ&Nj!OSDz;;QTD z7UNEcidm{3XU*^IwupH*{lu#|A1q~f({4Su6jvZ>8^*R; z&ECptlo1H9fqYfDyr@S=-+g48;%kNy%ITw6unZ5xemt9Icpbm za>Basj5FcUxA-R^1ve~uH!_{tm?P?#*>{wcjM)|@i8uH1r3*%ZUU-^dpk7QB^ ze0Jf;y1u7>&o3;^lv*Zre5b?WlLv!kHIC{#s8`7!`Gknx%fP&Q9*AMhKrSTv(DE;d zbqKc5COLX3O;5O^_it{C*w^GsVQK4UN$EV>S#-5V^@Z)(HpboW8l>l6T>E%dom9lh z_IF>Nc-1vaIk`mg|GSvoWwX4EL13MK`JDrvIHDI{1+qHs@%+g?M;<)hvbcHr^nep3 zF{($9f}7c$!N7${K}4<8(}`oESm{B=1?zS_?v6dN{7U?rMb}x_{rMycHd-(#=rWeD zs&lWdky^Y?q*r#LNQg_Trev^p#Q*913_2g@eDGb7x2x1c#KSD%z_rN>^*^fZZ^;J$ DW3A+C literal 3325 zcmezO_TO6u1_mZ5W@O;aPtA=lD9SI3Pfjf=VPIhNUEezMC{X%@LE}*aJ~l3GHbxdk zEha%mMpg!v#!aE$H)k2Dt<#;HG;6(m_PUGpZ*JUWFV8$`A$g^%PwDjtaJ@a+1OsP(s-LOIOPdH1RfLB6%d6vT7 z?N1go@9W%WoOnm;%?Xa#9S4@YZaY%8SnbJ$pho?||8r)oJ~Van(TBQv*PpHYy*6pf zf$!xSHd8fSJ>{(8&e%=AzHQ%uO5;5Cgo4Tq&leQh=}ru0ofha-QjrDp3o`?2gr2E^ zCD41<44N1(0dd6wW+p}^CPoeeE;bIWHji_*EX+&>frdf`0&L8oEX+Kd{;s~krAbE4 zj)sy3;vg|D9)TdwU{{4OBX@;>qWrAXn=q4$tD&%gAR8CwB(=`TpL9|f zCB>M5Mi|J6^BS5Om>C!vni!dznni)R=Eg9tL9n5Sfe^$>ZlHRg!DY_Cn4rwkNCROu zcCfFQ7@^){W@Kk}VqgjQ#pmTDy_7vsIBNfUcIo(6iXN=jg0kmiFA_N*JH=rA$BgQR zYfd~|GVhCRYw~#)#d~S|`?TBV(wSa=9cUE zfr6J}4s{#(Jv+Px5y7{Ck$WA8YoHO#j%*>82sWfa1X~)IA|jXuX$p7rKA&p8sIlSI zCNT|x-}^a#YrJxraRDyT=l^#;T&OM!yYM2}+=`b&KZflT)9mJpJ%JXb7FC|A zn{}_dJ?A*N*ww%poE#z1%VEF!~sKb9#@Sh!>PoQ&uU zrKrsljZP;_(60R6(_dT0S+<4svG{~EuTZHi5&2()X6`@uc-gf0-`)?aKJJ`c$XaL- zSP^Zywsc(+$HAF6Vwn*&E2G5n#;NyAb5~#B6VP-Idw=Cd<)s4tugGBzi{;~IzJ1Gi zTqBY4jOY0^k^JC)a;rr7Iess<_IfR)d0sXF7|S>32`oR~<9ab!_Cj zoBykK(sohypUWlp0}E_my_B4vS5lOiT!N^V*8Sc9l&UwV#i*9DU#29TZ@$p5ezQTH zNVls>oqS-^_VOFgrcEk*=2XAqA-C83eS$&F+l7iaJMPBS&MJ-gcs4TL_n5+gb?4+J zxm-+1@@0O)wX85oVAp~@lP@2&mr^Raqb|L&Zo!)UDps#b@1|$0P3VovxNtH4B5HMV z16a~r0pcoXX~TmYCI>?~6T*{Mm25 zMBjg#9MX0=Pb>GKj(yk7LvCBQGR}Ep{A$LXz?GsGCe{2gPbXNRyg({zSZ5Sj$B8nF z&c3v8f(LV~rp=&L?yB}WxRQF9d-y%&KP)?(nsAH}3( zdu$<%rM-YsolreZ;f~s$A9h@xpSZvJL*l!1@7~D|8eg)6TCCe-qFj-3^TWIK8(%2S zIQ%N>Q~C1~GjeWzOk7Xe~W_D*VaA8u&E=uAnGtrAb`t;3bwRiR+{yOtSOjh~u)I4EZWFWxH z%B0};@7R)U=Y!TXXV)xuRQ{UQdGJTcueREy%zta-j{eIz?0`Ca0f-^;vU&Gp?C+7EVR#oT+paUTHOKI%UJ diff --git a/RISE-V2G-EVCC/evccTruststore.jks b/RISE-V2G-EVCC/evccTruststore.jks index 12d0048303b20d2a2cbfef4ff44588fa6fb74fca..1d3ba67bb69544cdee20adf38210157c5521b6f6 100644 GIT binary patch delta 282 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 delta 2009 zcmV;~2PXK{5Zw?!FoFnK0s#Xsf(Rc52`Yw2hW8Bt2LYgh2oMB<2n;ZS2naBO2FC^o zDuzgg_YDCD2B3llxG;hSv;qMDFoFiHkw6`P%DcS?8>Lmt0s;sCfPw~q-eBQyvs5d! zt%lIjip@K1|8OEq8Sk|cXNdjcSf3($w%a`iaEQMjxv`A94S<@EU`3Xo^3ZJ7+d?4)GvTYx69?PF6IQWh`zLMAgKu6GzYr^g z(C(TaaxEPCK1n(tSy3(Z#$95z6?Z8bj`;@5IDy0JTL0DyZ=QV^ zoy7rxwP!k4di5QK@hp7LH%Z^ViZa!0!LkI`u7opATKpo<2qH zt{1EhK!R1-txM~gDsv#kNB4Pm*w=`9ai%TsCk0k8RU#7ci^tgDnrPBPnC|g?70+w3 zOV2W113en3)zRL(T>hl9WTN25?t}2J{E|>GC3AGF_D$Qa!=4&6#dtbSnong@0LE4p z`6=(g zq*S>YYrYiUyi9l#5>(xiO03Y~xsCLND{UQIaBcucsm`}he}L)5{|Gw&*uq2=B1{1} z2OyLx3XS8KeR1e6;s^ye5t?wz$@RJJk;~T5Zy70oYrwgSeN%9M&XfC)RsicpaNXtH z=g_s-d2=H=xV9IB`PFpg!ww0sG$d%L%EmSk=jPDHT>i*nNA);7F?Emn(;jQgwr+(y zaVw6JG$P0kpwm$Gxd4$)H+^7gNwj>2Jr{s4)j;2%R?GBtsp~(#*=9-EYWz>J*P+;* zAGLO*PaCgzCn2wY_GMyw4t*k95@BI+h+ zD0bBwVIa{?K=j!WpklQ`LE4FFf1QgS9IRCTXUCK(_Be-BI^E#fz&qI@Pcmld@2rYG zGJjXEA|A|#VtGYtJp-hL07Pxp@Na*`08_??o`%L?juB6PYj=rBD7aQ057#Qn*}lU7 z=jpJW!)0IBZ?a3taam3HvWqxE83YARKj`d%i&jlhJXTG5|NHXapZ@Q}t(twwm_jei z{d1V0QYyE@KvdkbplVy6#|6d2zA#x6tR8&aI z8t9d%|M_;b7D`%>U!Gfk1Qr*0+A^$v_e1f6ZnG5Wf$9>2(oZ})vhvz^E2Gxo<^pL8 zBRUd)k0Ye$o+IflKm!Vz7B*a714K=C1FI;7HniAWVZxOs)e`nGL4wDm0x>eX&}ygsj|-a}Tn|9Tiv?;H;202QJ^3O|x3Oy_#14Pj zpLE=TlK9aqG1`@~L_jZx7>kU&ofq8Z#E30m_R+m%^sTy6+Tdl|2RVl+tJjK3$EH zH0(}}wE8PK@wQS}l=+&Iiu)7hK&t98X@0IUe90_>>qq;ynbvPAqjLVu?3V*E+xA6) zS+D;~6801}cAHnu4_h%S rP?PTmL?U66QW4*mPdBp-1G0hYlQOQu!7Bs^ieUwYVeA7$0s;sCtC!F9 diff --git a/RISE-V2G-SECC/seccKeystore.jks b/RISE-V2G-SECC/seccKeystore.jks index 4962593991b109148a2c0d462986f5bf90d44fbd..679e1b5108d1e169c8c1068dd78f62d65cf5f986 100644 GIT binary patch delta 1001 zcmZ3_yOMW;Tz%j|qn~073=Ag>8jl+Av2kg$F|sgfF$ppktvYL~>} z7pzHtrdl;FUzD!f|MSLw1(owx^te{1`o`Gba%Xxmdsb!R!PVRcmn~Ygx1qC7HY$Dp z`$s*eZnSneoObc_-J|@_NtdO`H#BMf-+vQ!Z=ZQLfr$o$~O2LE0zB;xlcRZaY;y zoOW=+)uo(%`?~+fCZ8~QGjY+rb!RUCJ;Thv8lh)uV9CJ1c)_5F@eB}`EMR70WMX1u zG2mol*J|@PXUoE95NJ3#k2z3IPMp`!)X>P##L(2##K1BN$Tc%C0t$e+lY1ER9MZc@ zP0Y63%CWj_G{v;+UzKA;*{kV?b6eA^ZQifH5w5e-M^9j4<@>#wrOYSo0zOPRD*p24 zb?X3+vw4#rxO==eoovOVTYqBR`e3bJ(;nn5^}llQ%=>u%zt&fgoWtzSVBo@}pkwm? zlFz;A3s!NYhaKV$Gu@|luJ+1woqs>W8J(SGn@nU<;A5G^{>b`sjR*U3i#JI;4;B9j zn-?iw*!xS$!ddQd=zN6lZvcIM1&FIbzUK#epBc%%$pNe(Sp5$4xiQr5SO{WGrhvQs@C(TwHoG$%Pmab!1PQd_);Cy zEVbS5o*29ADHCp<{Et<9vH^=seaf@N4`y9mxA){8{%sprTVK|%I3I@O9%c^)16L*m z4+B@8MI~w{gQLq=Xdarx6r$PW_tM7N_vksjKr#14@=S^h$0g)%rsl3T`>r zSF~2%*tukL+>e_+dGS(b);S;o;3m-XSD^tQ0E&MmBnv0sWr>tTjdx2Vzx%W1JFNOJ zW6_*FEX7kKCC(kn>2qJ2Q>#-nvuDxqWg8ox*3V%)C$h2P{%jttdwe|C)xV^iIxgI~ zL}qr&td3=zrccF-)qs9Ct}7_9v~?}je`90&=ibeoD%IQ@i#U;-!R*Ok;0E;74_ijr zr?0m42HFW{GA*pyIQ7!I(m&^9Zwh_q(DQ%kdmgByr()wRrYBo({9=_YeQ{M;B-l{0 nxz%;v)qBTps5H;{?%CXu`=Bu8&-%I3?mv+&Pde<+ptl16vDlEx delta 1002 zcmZ38jl+Av2kg$F|sgfF$ppI2ouO0c^|y6)y-nNMgEbFF*Png6OJ~{L#swwv zpP8gyPh3{d_tJ4DH_OxL_ZFU((UK1ro4GMv*LKXi75v6~{)76!jY76}c&txF@BYTM zW?t!z-D1D~$h1HCy!M~N^QlL#7Mybt+NJY;`=QA#E3aJrKl2c?#vfnv@}NIn(Q-?+ z_nU6nS6P*r_HdnjN>`=I54jMP^hls*m>F0j^h^yb85kHZ8#FPV2jbEN%uI|-OpGiB zTx=X#Z64=rS(up&0w+r|hD#cl85kOx7@3=zMTzqoni`lJL%EZ?8S@>TyFDdF;DOD5g=-waIuiaOi7nHSCxy!vMeCs&ousr zUYT_#OqnB;OReu#_eY-tlSNsK>npa~DlECSb>ph50X9DQ#`7m$-trvTMbIz^l|A7e zS95s2cVp1*aQT^yNx^GYi1vSR_g|?Oy6b7H954)ivf0Xs@7=C(Nv+14$xi;@s%NMB z6s=hn@|=qjdLAOS08bb&A=^0lI!h#4>{}wdKiQKt-$5cpa`{$9os}={xy0;f$Hqznast zb?SPn^?$S~8V(n=Fe#`e;$IX?G4K2vqVe|Jv)G*{kvK*NrnrZ-f^Y VdO7R5KMp<~J4J8hO2*$GgaAU)iSPgb diff --git a/RISE-V2G-SECC/seccTruststore.jks b/RISE-V2G-SECC/seccTruststore.jks index 3477f2a921b7431ac33cc8842a1037a3734ff949..eead79664df8f6138ec24594f5d064bafb543b5c 100644 GIT binary patch delta 560 zcmbQjF@a-(f_C6SqiNF{@Le=WJOR zCmsx$xPVpK(8$ol(A3n#z%ojL-^jq!)X>NPDlqXtzQgNH_Y|ThU0OCby>FY#EyYy^ z5kFVG<5+!W_oriv0-wZj&M|l|Q0naT)cV4my$AG?yy}vcc5Hs2wY0lJru9GP_nOK1 zj0W|6zS0gg@=rgN@UPlaYbxy{HR9fA|yvwC-KbZG{>6UD=FI`qV^%1^D3AV delta 564 zcmbQhF@YHDC=WCRhIxIf?F)~6#IPao~~Jo#qA$|XGg zlMnUIxGk6AC>dUPiu1I+pAgSJ(WyVa8f>|^yy*I_j}I=LXntAcvFf>s+J*NsRylj# zot(#LP=CtScWM@^vq)^{wkAeV)^;BEZ-vNCVRmOQaA8u2U$Qt^n63Hbs>kV{Kk^hk zTD0#2zdn!O{f{iOHy388Xfi33ggWjInk5wWePXB2)AN|?(D9m!dpS9o;W-QF&i z7cZ@;{JO$);fENh4J+=iaA~c3UMuz8KtLoDe9<2edMj5i=VAp{AUxg zbC^9C3|yHMJe2oN|My9XH7{e#&%4TmO2Rpv1%GMs(AB++!r zB*pC8>bF@63(T4O9D^54c*GZ~QMyZg4Zr%6g|%~ksdoO$t^MQEW^%!+`@r|-0LakX AI{*Lx diff --git a/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/MiscUtils.java b/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/MiscUtils.java index dea077c..ae91d81 100644 --- a/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/MiscUtils.java +++ b/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/MiscUtils.java @@ -20,14 +20,17 @@ import java.net.SocketException; import java.util.ArrayList; import java.util.Enumeration; import java.util.Properties; + import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; + import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.eclipse.risev2g.shared.enumerations.GlobalValues; import org.eclipse.risev2g.shared.enumerations.V2GMessages; import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignedInfoType; import org.eclipse.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType; @@ -256,14 +259,18 @@ public final class MiscUtils { * JAXBElement(new QName ... ) but this seems to work as well * (I don't know how to infer the type correctly) * - * @param messageOrField + * @param messageOrField The message or field for which a digest is to be generated * @return */ @SuppressWarnings({ "rawtypes", "unchecked" }) public static JAXBElement getJaxbElement(Object messageOrField) { String messageName = messageOrField.getClass().getSimpleName().replace("Type", ""); + String namespace = ""; - return new JAXBElement(new QName("urn:iso:15118:2:2013:MsgBody", messageName), + if (messageOrField instanceof SignedInfoType) namespace = "http://www.w3.org/2000/09/xmldsig#"; + else namespace = "urn:iso:15118:2:2013:MsgBody"; + + return new JAXBElement(new QName(namespace, messageName), messageOrField.getClass(), messageOrField); } diff --git a/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java b/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java index 4439844..8074e0e 100644 --- a/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java +++ b/RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java @@ -263,7 +263,7 @@ public final class SecurityUtils { } catch (InvalidKeyException | CertificateException | NoSuchAlgorithmException | NoSuchProviderException | SignatureException e) { getLogger().warn("Signature verification of certificate having distinguished name '" + - subject.getName() + "' with certificate having distinguished name '" + + subject.getName() + "' with certificate having distinguished name (the issuer) '" + issuerSubject.getName() + "' failed. Expected issuer has distinguished name '" + expectedIssuerSubject.getName() + "' (" + e.getClass().getSimpleName() + ")", e); }