Bug 1166031 - Use DSA keys that NSS will consider to be at least 1024 bits for test_keysize.js. r=Cykesiopka, a=test-only
authorDavid Keeler <dkeeler@mozilla.com>
Fri, 29 May 2015 14:35:29 -0700
changeset 222219 94d943fadb06
parent 222218 f22235875dc0
child 222220 eb6e7d9d336a
push id173
push userryanvm@gmail.com
push dateWed, 03 Jun 2015 00:47:24 +0000
treeherdermozilla-b2g34_v2_1s@5685467cbdb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCykesiopka, test-only
bugs1166031
milestone34.0
Bug 1166031 - Use DSA keys that NSS will consider to be at least 1024 bits for test_keysize.js. r=Cykesiopka, a=test-only
security/manager/ssl/tests/unit/test_keysize/dsa-caBad.der
security/manager/ssl/tests/unit/test_keysize/dsa-caOK.der
security/manager/ssl/tests/unit/test_keysize/dsa-eeBad-intOK-caOK.der
security/manager/ssl/tests/unit/test_keysize/dsa-eeOK-intBad-caOK.der
security/manager/ssl/tests/unit/test_keysize/dsa-eeOK-intOK-caBad.der
security/manager/ssl/tests/unit/test_keysize/dsa-eeOK-intOK-caOK.der
security/manager/ssl/tests/unit/test_keysize/dsa-intBad-caOK.der
security/manager/ssl/tests/unit/test_keysize/dsa-intOK-caBad.der
security/manager/ssl/tests/unit/test_keysize/dsa-intOK-caOK.der
security/manager/ssl/tests/unit/test_keysize/generate.py
index b7ea48d517058bcbc65a5930e2e522252218d515..6e4599d650152e23a347702d6209f4eada4b8ee6
GIT binary patch
literal 607
zc$_n6Vv06sVv<<E%*4pV#KJHuHPC>YjWeOmgE5tvg_+4f#8AjUfQ>nng_(ylr8rSH
zIngOG#XwG+*U;3!)X37%(!|8nEJ~c$2*fpma&hQtVw?@cQf%y6Z64<=SQvpEUZzTh
zcUrtwyB@L|>{!1>F=^jQyI;G1*q4S^UORH}?N8~sroZ3Mzs)=Kx$+9_eN#)eOnRig
zcU8C48~@Lb-4`$|Tg#)F#2xzShEoaurp=nYUyoe$<$f#I=*GILKqWRM!)mEIBmd*9
zUxhx*-$N#~pSYdPoO`sR(2LFTTJ32jQHBl74}O`QTJy^#%T!&7KXvWg7cDb^F1lR(
z$n<cj_YyNXX{8TFY@SRf-xP0k-dHsGJxA!-BU_dyXuUe8n(jQU*eASpQNgiGb5|{%
zSn08&;xNxe4X-kN79D=>qDv;`rXt~KN58IAt<dtSd$zavZ6{}#V_Ue}gZSov{%NnH
z7Rq#;VEiz9Ps^v^TrO!gfpgcHs~MOo+!>AU7#N0kN<LYm_3(zLzz2iBrMz3NtL@+P
zhkchE`@1g_-1-A=?A1$IpIr0c!*~0lwn(|&u1|~4=P>OuT6!oZ@q}UPrp+&Em%To5
z^YBv#ML|(Nb2<A6`G0jX3HyDn$h!Bv<y|VGu-LGqbk0sWpRAM1lp>2l%$gSq8weWk
z10zjVn33^63#$P$kU~ie%mxewy1-Cdf2{MK?DtbHH7=3%`_I<@J)i6Rm`NnkT0OK>
Uc<;3T=4DEIO*#LrnzZ^X08XOstN;K2
index c57957fc455ca242a26c80cfaeb17468e7961cf3..c55a61633b230153838d1c0f4ae69e8c965b1783
GIT binary patch
literal 655
zc$_n6V(K<%V)9(T%*4pV#KL4!ciw=TjWeOmgE5tvg_+4f*ig`bpN%<`g_(yVr8rSH
zInm$SKu(<3(A2=x$kNc##KhDrN}SgS#5IF*v1@8#JO{+qZ0uTX9_K7r7=au;rp8W&
z?sBPLx7Z@*?p-kJS9i{ndtqO5q6C((MQ~0m?w!-#WqE9Wv7K(sxpR6u5|V=@k`tmo
zo7F{b5WF?<Z(lS+5RX9M?dM_a+VB29?YqjcbLV+y4()ByJ+5)O+mA}lPmGOw_FJx!
z;SBfuPp;<i2lTGZ%AMvawrASi(z81Y;)EZBUQT$tW7>}8YtLvii84&qN?vvUjKhZ4
zYiER7K4|*-RzW6`sj<Uv&X;BR`)s@y9hl}L_IKB|goO)Oj^?*%?GpFitQwgl)#J7*
zV1v;=i`S1Yh%v-!9eBN%zvjsm+wD7QdYD?Ke?J;GdrtcP3(Lbqj&kX1aq(saE%jSH
zkLCO^r^u-}FQSw`?YhcR-^+9F@9Cv)L!5GqihqA-jbxedF~K)gw`$X+a>je6`UeVn
zukbTB_AmgQBQD1{$!CgQ!h)@OH%>->x&HRy>a~xx{zrODC_e6)P%tlJPMMqVk<6Ew
zZx`;XyEc{i^oQJ@lz$eb8w5VJ-sHKZe6(WTjXU$o#U7eDdMW3h&vL2^dc8{2*nPsP
z*+*3a`(`_7?{|-VyzMi$UdwN>KWcgkN2Oh49|xOEYn=1@{GWe8%dhsoH98|>x>(o%
z63w#0jEw(TSPhtg6iVu0)@Lx#VG{AK;TN@wJ)Qh>rhZFl2UnF=Rh~DKh|IRTAC|NR
SeqhbD3HqCv5to$~Cj$WOFAhQg
index 07629f06038e7b03599ef159c6e983c8e65d7cf8..9ba579eb1e357e530f7be0b919e560313bd357b1
GIT binary patch
literal 602
zc$_n6VhS^8ViH-v%*4pV#KN%o^g#n|HqL}L55`nx7G@>`Nkef1Q8wmK7G@s4l;T9)
z%)AnRZ{6fXe{Tahab81H15+bQLrW7AQ?n>>ULz3K49Yc-H<UGyhG-Q5X-!RaN=!jE
zpowt~5KFPKYqfctvtVHaa(J048Qy8}TJ3tsZm?th8pWi2EA4*m{$XDlUU}`v#kW7D
z=bHY0KmRuG)aS}8wD(Od*)r*o`rcLDQg8e}KXzZhv}`SpW)gSkryEWs{F^pw_I^Eb
z(U<$JT%#N7ssfeRlnkq->Wuu4vwju&Fn<r3)PCZ2HgoRLjzTXs%WJi#nM4^jFhBTZ
zc52Npmn>6tCH~a4b6>Q~1iI*Q^&`{6rQS=-<fN587_oUWoqSWg)p=vl<o6t*XOC=I
zo}l&WoNBuBv|^v|+C>G&F3nxFcw(i;j*7!P7d5=f^jUQHxr;8Dn45}(ryc#eQnf<M
ztM1v}=C_@kVUBI#ZV%#{1Nx`Ej#?<wb%OE3>^&`?f^)f~*#ypAXRcuY+TP7n`FUxJ
ziPm4vBc~VqoYY`)N4V&tqtqvdZQG}=?`brcxUj)s<#C_KNqtKsO8$L)6Va5ha+_es
zWBcsh84v#OX!l=S#1~TLs9kKw;{AwSpsRk~ZjrNlLf756=sz!$_w-~jUy~fAEFmS;
zH#=VL^yroonAh>RO7i4yl!U;n&tRa#B*Jcb`?ka^-hQ!yHlg*;s%2Ast{i0&DZdzW
Wc%P+Cpmw{2>-oojt-=*QTm%3Z((!x%
index 9b5cf38bf6f09a71c3ef86b2f51ad9605ec6005f..e34c1487136f57bf78b72a81727cab7b7ee9bfd1
GIT binary patch
literal 654
zc$_n6V(KzzVsc-=%*4pV#KL&{%OwMDHqL}L55`nx7G@>`DMJYZF*fE<7G@s)l;T9)
z%)An(#1!4+M1OAsIdNV?Qv*{YOG8T&6H~J&ab6=3*9^)vkT;YykcQ|L0qIRm_4h_G
zpo#Gu5L>gcYqfctvtVHaa`c!QI~lsmrGDLFi=4Z6!K`21IZy6|ea(pySi%;;IkC8R
zPJ5T-vHit%x;5v{>Fr2J4wgtxi2iI=7r8<3*2KSk(F{R60)e-mhp}tF`~S4>D#y;9
z=bbsUw@LT7#_4W9DmgzfHtyMPxk`pJ-19%Vn#Ui|yEZF#nyc8JX?IJ{?ktECeh_*&
z;qi`XJC?6Kqs=7BFj*^k)%`OL8(y!S5o-CM>FZksnMkI_4!=2HmgVoW@m_RbnvdAu
zUE2~CE?_yD-=?)o+<UWXWRg^m+p2&KM*l2cKfWNw5UX|I^<w^-Cs%B@@2KfvYMK81
zXx!{M>H9A%4-+}crLV=sn-#RwZ}mKu^T(Vbr{=tfQvS5-DocGY&%M8=m%a^g$}uYb
z{h>9IWx~e<-&EbIO_$0U@0sc!DCoVy&)nF<0CY~_FHXHP`M1{YSv{}vnr>%z2#>SK
zxw?d~Ep_*D)){9mH27=JC%EX=4pqhXZfXxiniRh21}<@Rt#2vlSoM6_y5syjcO7;o
z>^wVT;iKhyRkmAQS(I|?jBI*0-#nrAxnH7Kq-(oBA6Bn?Y7^*jUi(^jr0pAx(+Xvg
z+XA+C&RiS4bFRwotAUTrKb4@Q9cBXt16?MOpmhh6FI+FG+5Ge%=iJA|GFJBgZvq2$
ZX5^iPVrEBg1Rk~aSKaj}Z06T`B>=q06vY4l
index b3b083d686e299d3bb358ac9ca88dad5d9cb50d1..d5cc197e19116006a133b9cdd3225a8e780c4936
GIT binary patch
literal 654
zc$_n6V(KzzVsc-=%*4pV#KPD<U*3S5jWeOmgE5tvg_+4f%22{UjEy;zg_(yxr8rSH
zGq1$oTQ@n;DKW)BPMp`!)WFop($Lbx#MCTGoYx4%HG^^u<PBvFq#=4mKzdVCfm)Fb
zXkt7E#MW%=T5TTZELa$U96hGSPKNGssb9C)BIoX1FzZ)$&Xap#Uvr`amas)|PAu-7
z)81uyY=5zxZq2!KdOH%5gC&v^qCcC}MQ#whHSup>G(!-NK;Z4?VeH!P{y*)z%CU3j
zd1nsoZPGoiak|@&O3qJ=jeGW6u9D#l_xw+;=J5yguFcAw<|?*l+TGH#I}753AB0{`
zc)VlUj^%65Xfug2Ox8+Xb^naRhSzIngjzmm`ubKuCX%VK!*9-)W%>JTycZpq<|FoZ
z*S3U(3s{ckw`uJX_ui};nIzTYwklwQ(LamVk1vQZ#A+RQy_mn|$ran}J8F8ETBd(L
z8aI1R`u+>c!$gj9>1%QEW(6(vTRo5E{4uA<sW~sAlt1md%2MCUbMNozrEf!=a*T?9
ze`t+lneZ{eH&wT4)1`98d#3sa3VN^bGdK1y0G$)Xd-m>X_4qk$?K^EO6Q6Ha`dH${
z7Sj5vbyaPJbrjQnYi7OYpBvN9O$lDZqH3dXHTsl@>#HLc=cc`#oLwva?&aSNVzbLE
zHFE3n>n3iB@hawD;na61X|9DD*S+H@rPE){e^$=;PR2rL(#=Z&m-EAI)+?Euv)jJ%
zmBzAXR~fE(RdUD97n+(O(u9(Bm<<>VbeTkC-#Nd^5InO@C1X{zm%S7t_sTU3fB`#U
YLhm`>X)^De)wxS{xR+YY&#B1+0Ill_=>Px#
index 97ad32b1e9e1b0ab4784fb70b39ed5b225640245..8a3896d823fa5e45a48773432ded9c7b92fbc467
GIT binary patch
literal 651
zc$_n6Vrn;NVsc%;%*4pV#KOcfWrYDZ8)rhB2V*KT3p0~}q@lQhC>wJq3o{R2N^zoY
zW?qTEw{CKxzqf&$IIp3pfvJ(Dp{0q5sacdbuMvoA2IU&a8Oj()L9_~kw5Fy4bt36+
zVmt@L)@<xrZ64<=SQvpEJ*LJ^hVF8yU$@vI=k8rF>sNQqlY3!bbD{*6utjiAEbg7t
z-eq}gf3clz&AD@WI}(zEC6W`OKbzG>ZV<dR@o!%=LlBQZ;O*yO?Aq`CKkd89v2*8n
zXAbRc(mk$my4#OR&QFYud-hwdlHm;Z{7<gt@dxy-&B~qTDz<0Z-O{r=3*v+ygkDZ~
zykpvq<!jGqGl?=x)=FM=|BS<i*K22lT0Us{`c^?ElBu!7Z_bxx`TK0V7af@9BldUK
zwuFTXSdQkmY3&mC-mDs#B-P`#Dqw@rKa1CoFNiV3Y8`mJn7`)972EAQYI>Mjrhh*g
zH+xR{{tL^)M2>RlYjN>r1ugYkJ&)!5F{j9>IWMA=Kkd58Qs2vS@9*iQZ$q4NjEaAM
zXpLl<@G-$RRkv!>rE<o5ruqj8dav*^H})_9oud<Z@4ENPHQAwe^tRb8Fzj5tc7m*h
zufh-Z^Z74VPdwYZjr*o#%!zn6pZoF!0!vR{+xTG7`~~k$u)HrSsZ#g2sl1(WA_vRa
z)@wJGJD%m4Blde?(pihQ35~V~v$pG}ygYPykJj=l_rn>gJEAlV8P+r}<;_0TQCV@Y
zqW{Z>?pZwP7Z_U^&wY-+!hw=<nDrS9beKf)d@sB1i~GCxMnGYi&#@eqEfb?}Gl?Wl
Y)p}xY(D_`7r+mRI*Mim^2G@520Ni^K;s5{u
index 79795850171c81c728430ece330b041a35e3aa57..ae51436e3e8eff1d95cfbf5cef1c4fd45bd6da5f
GIT binary patch
literal 611
zc$_n6Vv09tVv=3J%*4pV#KL&~qnQCW8)rhB2V*KT3p0~}u%Vy<KO1u>3o{Q#N^zoY
za-zStft)z6p{aqXk)@%fiHWIMlsK;uh-(Jr8b}#R7>GeM@q;vF=9M@lra<&IG0p~J
zDK>VkHji@_EQ~-7FH<GMJ1t(TT@Tp}cC25cn6z)D-LKt0>`TKduN}Gg_NVk*)8Fss
z-{zhATzQ4|zNsZ!COuN$yQ*92jsNGz?hBZft>w{7;tu_E!>NRS(`L=yuSYKWa=(>p
zbYoprpc0#sVYO79k^gbluR<T@?;(@gPu$LC&OO>u=*4Dvt@bpND8mNk2fxftt@-7W
zWvZ^kpSpJLi<X%{7hSG?WO}&Ndx@Exw9*G7HczILZ;H1%Z!DVpo+I?^kuA#;v|gQ4
zO?RGF>=RzQsNmS8xvLgWtn}DXahT_#hF6(Biw-|`(IpdeQ<3nrqhD95R%m(EJ=@#-
zwv#i=u`S%~L40#S|FqXp3uU@aFn*Z5r{z;{E|)Z$z`5(p)eKA(B@4M*{??z^ReXC*
z>CIUU*=;jL*1Pz>+ZZWg#I9_(V-KVHv}4NG?cS`h(OA*9@9qu_uNg@uC2xNG{n%dX
zHYtCNOs|a4ma1QO9=^HVuC(E7$TPd8eSB+fZRg&<Vdjw=m!I1GnzL#Rvyt!TrJI(z
zF?9XEX882(>NT@@77H6d;#*djk?}tZs{u2RLP-(K`V0m-Od@$YwLfMq;*!w))|npU
ivVy&1=Q1TGk>KxYtAC%b^|W*j+COtL>oQ#-5hno3pY_}T
index 09476591dc20b5b84e48f170c679cdc4d39ac768..4f501103e1d8f82cb167fbcf8974146726375fd4
GIT binary patch
literal 664
zc$_n6Vwz&m#1y!InTe5!iG}eF<5>f4HqL}L55`nx7G@>`5knyZ0XF7P7G@sKl;T9)
z<V2^$6azVNUPDs@QzJ`5OA`}QvnX+1BM{dN$~BNOlrRv3=;8<I%FHYA_lD|iVmt@L
z)@<xrZ64<=SQvpEJ*LJ^hVF8yU$@vI=k8rF>sNQqlY3!bbD{*6utjiAEbg7t-eq}g
zf3clz&AD@WI}(zEC6W`OKbzG>ZV<dR@o!%=LlBQZ;O*yO?Aq`CKkd89v2*8nXAbRc
z(mk$my4#OR&QFYud-hwdlHm;Z{7<gt@dxy-&B~qTDz<0Z-O{r=3*v+ygkDZ~ykpvq
z<!jGqGl?=x)=FM=|BS<i*K22lT0Us{`c^?ElBu!7Z_bxx`TK0V7af@9BldUKwuFTX
zSdQkmY3&mC-mDs#B-P`#Dqw@rKa1CoFNiV3Y8`mJn7`)972EAQYI>Mjrhh*gH+xR{
z{tL^)M2>RlYjN>r1ugYkJ&)!5F{j9>IWMA=Kkd58Qs2vS@9*iQZ$q4NjEaAMXpLl<
z@G-$RRkv!>rE<o5ruqj8dav*^H})_9ol{kjVwn}XG*h^sB)>`R`)|e*lY=Twrk`S%
zdb#QItFUX2Uw@L%{~&(d{owh`G<K$YqFco@!v6WLPj%j9^yyty=)Lxb=Pt|iRxUf3
zKJAU)F9#Emc@N7?+{H^*ZxzbkYx>t<ZR6o4uPyKI{Ro<=ysbwqV@Jj%i-yUe4{N7B
zIPWf4-jaWOLXX;y<i)}Uf(HD+*p?M$Wc<&<YQPMnP*M@I0fT`qFkJhsg>+rsw_Q!Y
mTjBI>+A+nttb066B95;<xP?q!vo%b0mi48buEvW(1p@$Y2NaC}
index c12bf8851064c59d9abe94e33878c1e6766d0ae8..5076e221a8efa29a6fca377f6fad161862fa10df
GIT binary patch
literal 661
zc$_n6Vwz~s#N@w#nTe5!iG}gRd1(V~HqL}L55`nx7G@>`VM9R!em3S%7G@rfl;T9)
z<V1gO137VCLsJ7&BTGX|6BARjC~;mR5Z4UKHIOtEHxPwr;sa^Q%q#KthG=bKJO{+q
zZ0uTX9_K7r7=au;rp8W&?sBPLx7Z@*?p-kJS9i{ndtqO5q6C((MQ~0m?w!-#WqE9W
zv7K(sxpR6u5|V=@k`tmoo7F{b5WF?<Z(lS+5RX9M?dM_a+VB29?YqjcbLV+y4()By
zJ+5)O+mA}lPmGOw_FJx!;SBfuPp;<i2lTGZ%AMvawrASi(z81Y;)EZBUQT$tW7>}8
zYtLvii84&qN?vvUjKhZ4YiER7K4|*-RzW6`sj<Uv&X;BR`)s@y9hl}L_IKB|goO)O
zj^?*%?GpFitQwgl)#J7*V1v;=i`S1Yh%v-!9eBN%zvjsm+wD7QdYD?Ke?J;GdrtcP
z3(Lbqj&kX1aq(saE%jSHkLCO^r^u-}FQSw`?YhcR-^+9F@9Cv)L!5GqihqA-jbxed
zF~K)gw`$X+a>je6`UeVnukbTB_AmgQBOY^Hou4(>F)}JApeV-r^$ty;7xEi?or(>m
zrUuw*IlugwVY>gR{JvGayDKCXPh?&kQT}7+PkFO0A#2e~@0oLdeG@e^44XPN_gc_@
z_Kl3|5_shDWCFfTdB5a&)p8y2`7`q>IXSkh=8)U_$49g4(Bd8TCeNdv2JFnLv~6SG
zZq0d>N9pc`1HwFug$*DnL{^xQ@jnZz0W*+7Nkh!~3<f$(A_n)S6&?PTzHc{YOkvZ*
iCgBJfy;n>kd^SfEFVC2L>M84Fk-Kk04;JoEtN{R>2MP!P
--- a/security/manager/ssl/tests/unit/test_keysize/generate.py
+++ b/security/manager/ssl/tests/unit/test_keysize/generate.py
@@ -130,9 +130,12 @@ def generate_certs(key_type, bad_key_siz
                                     dsa_param_filename = dsaBad_param_filename,
                                     key_size = bad_key_size)
 
 # SECKEY_PublicKeyStrengthInBits() rounds up the number of bits to the next
 # multiple of 8 - therefore the highest key size less than 1024 that can be
 # tested at the moment is 1016
 generate_certs('rsa', '1016', '1024')
 
-generate_certs('dsa', '960', '1024')
+# If given 1024 bits as the desired key size, openssl appears to generate keys
+# that NSS considers to be 1023 bits, so we have to pass in 1025 bits as the
+# desired key size.
+generate_certs('dsa', '960', '1025')