From bcf43e63a2bc07e866825c152adeca0edee38c9a Mon Sep 17 00:00:00 2001
From: Vladimir Diaz <vladimir.v.diaz@gmail.com>
Date: Wed, 23 Aug 2017 12:47:20 -0400
Subject: [PATCH] Edit metadata and code for developer_tool.py

---
 .../project/test-flat/project.cfg             |   2 +-
 .../project/test-flat/role1.json              | Bin 740 -> 716 bytes
 .../project/test-flat/test-flat.json          | Bin 2198 -> 2197 bytes
 .../project/test-flat/test-flat.json.gz       | Bin 1192 -> 1173 bytes
 tuf/developer_tool.py                         |   2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/repository_data/project/test-flat/project.cfg b/tests/repository_data/project/test-flat/project.cfg
index 365a07b5..1564431d 100644
--- a/tests/repository_data/project/test-flat/project.cfg
+++ b/tests/repository_data/project/test-flat/project.cfg
@@ -1 +1 @@
-{"project_name": "test-flat", "targets_location": "/Users/vlad/projects/vladforks/tuf/tests/repository_data/project/targets", "prefix": "prefix", "metadata_location": "test-flat", "threshold": 1, "public_keys": {"5602f4df0cd26b2112f0833b1ce8d5fcbb595754961d3a04f37b9815e2ced503": {"keytype": "rsa", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsDqUoiFJZX+5gm5pyI1l\nVc/N3yjJVOIl9GyiK0mRyzV3IzUQzhjq8nhk0eLfzXw2XwIAYOJC6dR/tGRG4JDx\nJkez5FFH4zLosr/XzT7CG5zxJ3kKICLD1v9rZQr5ZgARQDOpkxzPz46rGnE0sHd7\nMpnpPMScA1pMIzwM1RoPS4ntZipI1cl9M7HMQ6mkBp8/DNKCqaDWixJqaGgWrhhK\nhI/1mzBliMKriNxPKSCGVlOk/QpZft+y1fs42s0DMd5BOFBo+ZcoXLYRncg9S3A2\nxx/jT69Bt3ceiAZqnp7f6M+ZzoUifSelaoL7QIYg/GkEl+0oxTD0yRphGiCKwn9c\npSbn7NgnbjqSgIMeEtlf/5Coyrs26pyFf/9GbusddPSxxxwIJ/7IJuF7P1Yy0WpZ\nkMeY83h9n2IdnEYi+rpdbLJPQd7Fpu2xrdA3Fokj8AvCpcmxn8NIXZuK++r8/xsE\nAUL30HH7dgVn50AvdPaJnqAORT3OlabW0DK9prcwKnyzAgMBAAE=\n-----END PUBLIC KEY-----"}}}, "layout_type": "flat"}
\ No newline at end of file
+{"project_name": "test-flat", "targets_location": "/Users/vlad/projects/vladforks/tuf/tests/repository_data/project/targets", "prefix": "prefix", "metadata_location": "test-flat", "threshold": 1, "public_keys": {"4e777de0d275f9d28588dd9a1606cc748e548f9e22b6795b7cb3f63f98035fcb": {"keyval": {"public": "-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0GjPoVrjS9eCqzoQ8VRe\nPkC0cI6ktiEgqPfHESFzyxyjC490Cuy19nuxPcJuZfN64MC48oOkR+W2mq4pM51i\nxmdG5xjvNOBRkJ5wUCc8fDCltMUTBlqt9y5eLsf/4/EoBU+zC4SW1iPU++mCsity\nfQQ7U6LOn3EYCyrkH51hZ/dvKC4o9TPYMVxNecJ3CL1q02Q145JlyjBTuM3Xdqsa\nndTHoXSRPmmzgB/1dL/c4QjMnCowrKW06mFLq9RAYGIaJWfM/0CbrOJpVDkATmEc\nMdpGJYDfW/sRQvRdlHNPo24ZW7vkQUCqdRxvnTWkK5U81y7RtjLt1yskbWXBIbOV\nz94GXsgyzANyCT9qRjHXDDz2mkLq+9I2iKtEqaEePcWRu3H6RLahpM/TxFzw684Y\nR47weXdDecPNxWyiWiyMGStRFP4Cg9trcwAGnEm1w8R2ggmWphznCd5dXGhPNjfA\na82yNFY8ubnOUVJOf0nXGg3Edw9iY3xyjJb2+nrsk5f3AgMBAAE=\n-----END PUBLIC KEY-----"}, "keytype": "rsa", "scheme": "rsassa-pss-sha256", "keyid_hash_algorithms": ["sha256", "sha512"]}}, "layout_type": "flat"}
\ No newline at end of file
diff --git a/tests/repository_data/project/test-flat/role1.json b/tests/repository_data/project/test-flat/role1.json
index 535d3f90bc7f1e6da1495414672861819bcfc81f..6ba90f89cd15accc4e15d6180cf938267d36e296 100644
GIT binary patch
delta 219
zcmWO0yHNx|3;@wO<D83PYYP)YqmgDLk{||sDQp5D1#%$`BETjPHi7Q<cmKJ6J$;4%
zV%sQn4acdrd@gj)Zqr3tYgl6VQcW!Kpw8Yp!Jrn|`TRJJ<NSDkJ710yg$9Qwth7Qf
zxe_(PB+y|ps&7nXQtj01ORq?Y0}x_Li4t;S?tq=Phf7LJnQkB9V9h#+J$TQM3yc><
Rm(9Qxz{LRd{kZ+!{sF%zJvsmY

delta 267
zcmXxeu}y?A3_xK~T=P#6MU)hYoj5kTP&l>&6hHwTLbn3DumLq=FbKJV_7zXx&*}H{
zd41MGy(|#-AZ!KAT7&^>HKGMT;Djg*o0gqWnX5LQ;V#ou^39P_%1`n3@Z$M4<#6b|
z{`c3%`%APk8dHxZP=+{Ea8v3gXIeUYTQpY;>a!ym8zRI03?|_a8MeeWZ0aB@6Nv{z
xC~#ShORG%Rr7U%gwZ~n@HY>CeDlQVejJ%Z}N4neEyiLz>vA!Sa>$v*9`U6e>NSgov

diff --git a/tests/repository_data/project/test-flat/test-flat.json b/tests/repository_data/project/test-flat/test-flat.json
index 7e90d071bab8a306d2035137264759fec9a379e6..85da4f75d356db99922e01dc9f7ddefdcd33f8a2 100644
GIT binary patch
delta 1105
zcmbtTyUip-3=Zx{$gTo@tq4K#*kg}PL=A`r{F>teB4V^L0TR*)8lf>tz)K5+BYEua
z`PYX(Km76abN4x?8VV0zD^ymkGG79cdA2rhz1D~!$2d*~U7>3V#5d#d&6jU)Z;xL-
zeSCcP_Bgj$)=om+u5byrZJmz}Yik^aj(ruJVc&AEXX7&CRTsM?5egXl9xIddpw#Rn
zZG@wg)@RXX(81EHN>{|ngIBjL+>BZKH7RB&$P#{5<~@lNfgXbe3p|giplRoQUQnhD
zAclF(h>Wb$4ldCfwSW$ub<mUCxWeu5hLi{+_e5F3g09C;`_9OyK3Z;p#j)m-4$%`q
z9x~fGa}>50ey4q&c}MOV+OikdagpkK9frkd)}TEEStFWRu7NZ|fNNXTI!&0~maS-D
zc`1w7*h6iQX0zcqVk>FawYltdMH-cKX!}}E4h+>fX0Evt*SJ7;6Kjqjuk$;29~s*{
zw!;jexI123)s9vIr$+;lwc2m`9{uF@_|qqHA3p4SCuN7ahRkYC7?0J5)RX7Ea@Nkf
z8>qHnv}fQR-6t97JD_It%sL*Pd|)4JQdo;pCR_xS6W0RcF;Fj5?=l>8;};mxiczjQ
zUrE2AMKMW&RX{(&Y&kW$sdbq3UeSw|S1O3NOg(CsPnv6Q_hCtc&}YzJbW~xt%Ei)D
zyQ_AJeg6I358uy!#OtdqY}k;w1PMme*lRK>$y~vV32R~Rk?Ph2pTMDI`{%FT{}wkd
z;vVa-BMPvLf5W=(>Y!q7nl2m;!Zl4%TC>as%B-^Kv^`$se0%%#zmmRcnm_f={c36#
VGB104{^z~@Z>)cR`r_Mn{{rc;GgJTo

delta 1122
zcmbtTIgVgO3=J5P$+$tQMaW1lFI6@XLqv$^n7}UE3;_^8I%<iG3~2-x;b2?=H{u2)
z|4X&JdVb3vpZxjB@1H))25ioTo45nl!UiRZbxTwFMu^D~w!M-ZxaoxHlEPalK#!lj
zet39z{Gon%_ftN8{_yzC)7z(~w{O0Fdirnc=kLFJS%*BJslcU6SC{X+aG#mkik6i+
zQER4>r)<lUEA@1MamQ`cwY}I71)ApL8r#Bbm-PxH%e%rA&ut>!*?ei$w&U7dkh@&>
zW*K0nD&42m^*JP6-R9UrR7*SuWcg~8Sb5|uJF2kmC=z&KB#MO~7*t_mK(L}Qq;8O#
zIP)-&S}O`StqrlU>hj<S7e-zgx?D1_a-ZErXq~E+hUNy99_JWcDk<<nf((M~t^n&r
z0-ndUO*M%964hq+hI6m$#Q_K`xuSsUWtjF+7wCr8jK$r@!jZyGi#^w#OC5EtoMuY6
z<bfW;-)0U#x9lO~O?CRriG&=LL1zcy>@2_IUBJmRYFvY*DApTQ?Uw9n8Y@T}oNpNt
z`EhqzsFly7;DiC<GRw?E0}wr$f^6=IWmw?YJR*~@*NYVr8xn0{9NK6!)MFsWy}0vR
zJJj?7oAHg@OoybX-RkaEmM-G1c9rqJgvTPGF?N@-A3D94h6ay3+xIaC!_G;_!LS^E
zX-!nekt<VzHH<4pR4h0zEXI@ronv+mt+~lYed~x5_~W$Y{p*Ksr!|jLj2}Pz`q7tP
zIP3{ET4rtH(eUyl2G!TyyAe0$CNdu63F0PKUCtVnIU~D$c=hVHucopKZFk{3yV$WB
vr)<JlR+By%rKU#&j9W&JJjK=GqsFZ6f0<2_-+%b~mHlr<f4%$o%}4(LY{WDV

diff --git a/tests/repository_data/project/test-flat/test-flat.json.gz b/tests/repository_data/project/test-flat/test-flat.json.gz
index fc67c339a653a7c17bab1e5664cd59a996410714..48fd264d67829d8820beeae0959be7738dfc67bd 100644
GIT binary patch
literal 1173
zcmV;G1Zw*qiwFS5shwE@|D{#ijvF@&ec!Jz<~eO8>PF@}`qUx_D3Mwl^<H2*L4sia
zy=QFiEogxP1;!8ZXejdNTz=eamgDaBUQb^Req26o{=C_2e&DxR{_^iT!#_**)|z=R
zYGsNM7iKfjSVJA7W%iPJiWBwPr1Um=nl(+~kjfl=`Eag>W7cYIdZ{swL?tVSnJ7zU
ze5fI2?yUsxd2-Ma@-$U*iXtW2B)2*!SSaMPiAf#W)8OGFu~TTAhIor9m%wPnqZ!BE
z<7hNFOQc+ASYCHl5vo*b*A~Z^ZBXi+w4)WWprbKY6814?;F59(RcK6+lq87{X%s8Z
zZZV`rEjH4TREl+#R&p4%cS)*)YOJM_a?|FTM<3n1v8i;j(jz`%jM;im+AFG;F@UeE
z?Q6<yOkiyoy5?A{X|3jSYQPKt%mX{dE8M%6Qm2IKCG?=|Viubx8tO8fNrH@-hNU7!
zI|~{eUW9NR5=Y851qZ9mTAesCrq&osr_PMCM0w;v5m%6APK5{HSWnNr<W|Spe%63Z
zR8^IxL~|vv8kz%vRAY3VLo?8;({VZ8`pB)cqGf_%ExBQq=w$?4FzY%KmT{memhK^0
z7V55}QwHc@1!?ZVu(P3B!IY(i+{hD$7}KcWRSGu1R0~pYdpv`AHX$^J%L+m%cHm|{
zR+7)omO5AzqJ<Ptq!~bC@h;*yc8@8l4GvYkLKv1!!DGu=6*DF@sMx6MFw7x4*Ga~M
zWk$=R$^tPw-E2O6xGK+Ajjf7XKA*ln`YMr=9&Y_~JnLpL-}|keb`ST*>&CM*UlyAM
z%@9qEE?t0360JQ|>fJyTsQ|p9Wf~o%H}VYBr_B`@4PLXpRJv;Z^Hz`B&$_>TIP6Z_
zyJuH8Z#Zrhs<|loy2d3em*uAquVtQRaidbAEN@<Y)&1*{o8|FK-|xn{caBMvLFB1K
zHIxcA;ud{I@5xH>6jp=ii6T_bDPkZ2wiriXPjYSJ>G`bV*!tbOF3vBWZeBJmhljnt
z4)_j+cXR)5jDJGtUN4QU=f@Xt9`&?+ckFL-xA*kx>D%e&0w+J*?O@xx`_)ya?vMWR
zY6~mhKI~Uw#n*{H-CU<${M+O1;`R%H<iCW7=l2jko}WK1yn80$Gv^);K6l^F4aIXq
zFZ^5S;>R~Ex{?ItYw0{{n<WldCuGD_!puRnG)>SJmn<Q`JVItEx#ooX&M=&kb1;2D
z=E}1*jcUt4wX#li*c@ytG}wf~9l6hQEkl}+B`A4yVwtPr;rk;acru)1wmOH;JPRQg
zAm}*f>iR*d#l&6L8b}vT6Vh%-Jk1SeR^d}u4qX~s_I`hR+M=%%->~WpR`j2-TEod1
z6fYqdgY`L6W@CqW5nP)ha*!roAxOki3u}<Vu_9tcMg9RRBxTQl0y&XTr4vhr>s0~%
zh^Z7{{$#niCqs^Rtpyfs@N_QlWA;@0hz)6-XI2A@aDT6y5cs96(J>HIL>?eNfHq7*
n34;nUJ;3$;4J*01lJdgGuYNef-!620x_SB=ojVBhl?VU;5G^}N

literal 1192
zcmV;Z1XueXiwFQnYi3yj|D{#ijvF@&ec!Jz<~eC8l9I^0<qwK(pIQU~B~fdm-V4@F
zkRaH9FUR(7Hbn~*C@>ylBn^i=Jm>J+)n+;DZtm>(>Cq3%yUib0o6WcQZI(a%>u$u#
zk_+JEF`*AE4O7AiLex@s8F}{BvgVpuOB!UrlWJ2**|Gb`K+Bs`yjwqR?@s}Ly?%dv
z{r>GQ*VmV=$Y5QEQ9*_PyCg}|t&9$xnbj$&ixEv3L&!!hI_gM6>TIAqTc0SYn6n~g
zm=rgYR<x-W*O?lUj-Hwc);@{2jLDsn7p*3f9Y%4JQaDFoCU+@yO2o*+#57JNMA3n@
zLQa+@=9WgyHE9)r)B}%(9Ri@15HdFMrdfd?wTUfzZ)BQ{ITFa8QgbYn3bcamog+?W
z$2NM7Y}s>!&D|_#O4U6LMKuK<)@oJi<k`U-2}UC*W&)5_064xaQ$-rFbs{fpHlg-z
z(lG)w^xU%mrnQ!7fh|yP;!zdPS+yBb(>k+yiFao6+H;*u13FnlYmvQ16@aE=MlLqV
z>#T8NzzB#zVh5p?;nt&Z4eF?YMOR3IS!Y2J?VgKIiawA`Fz&8MWYx?lp#*#4_;hGN
zf*jRQyx(R33c2tMMmB92Ee?b!v-#SG+zJfTgsoCRrO3QR#AsdX@s~;yl@6@Ry^X?D
zDLYM5?_~<->BQ5gNjCA!(Vk4v)Z)Tcsm_w5N#nq#SgC5DI7hIfV$%`5r4%fUcJv(d
zPm!><KolM7nnZM@!W_})5n08XtTemVYy`H17@n>+AKqL<>8n~+F)kmEUmtvx$k85e
z{CGI&W*NTs8$0gq?+%xPC)K_@Y!-tOVn7|k3vs~TIjDwWsh2Vl3ywmh9BBoE3z<kV
zmgZvwT&6FPE_U#7YlrPe+uz(j?vC5rXTvxhIBX4bIV<||oD(kR#}9A5hk35W2j-k~
zdA0S~_TN9bSsp&M{jRTP!)+33nT~;5Vnd%8K9Lz+J*1PP)8PRGj3q}uM|Jj@ExH-2
z#V%<)UA^3&&erpIzxVHD{7~!<)%|ZI|Axbz-JU>Lzn@+pc(CL4htK{zcYCLwj$e*{
z4{-Fy+g<qf?r!zYY5Rk}Y;D8KxA*&%KIwbKAFeJ{FaG6WceeWl!=K(lit9Ikcc<(3
zGrOLt_ROq@N1wYdr-afep%<2|r0~Nlu3V@P;Y)7P!$@=Lsx(4+t2;A<t<}(Y9TIZ`
zpsjO5G~~viA7`nt&M@o+nG2gDB$u!mup%}?@!{>-LtDu$j9c0~#R{)695kpg^rCY(
zkHOfvBxW(6wS?-z>@rFyaJBO}z&dCdiKN*Yql90EG03PGX22oeAYiTMMx5!hS@wQ+
zbKFK=lwPsw6;}A4vEtP+gg`Qchf<`+$T1JSKtakHlUG->5vm?`MHRw6lg}1J3x?@G
zV6~1R4k%I>d_-yCf*cAe8u-V!A()<VaEzBwOt95TNT!d(O>(UyPNnr!6L+3$!F?_<
zcZ!7DO3oN>cP$me-C}+QXniPT=$J9OibMVlE4{jq^32E2{&)x%JJa>)>gg|w(WbnX
G2mk=^B}#<=

diff --git a/tuf/developer_tool.py b/tuf/developer_tool.py
index df221579..a39e4df5 100755
--- a/tuf/developer_tool.py
+++ b/tuf/developer_tool.py
@@ -764,7 +764,7 @@ def _save_project_configuration(metadata_directory, targets_directory,
   for key in public_keys:
     key_info = tuf.keydb.get_key(key)
     key_metadata = format_keyval_to_metadata(key_info['keytype'],
-                                             key_info['keyval'])
+        key_info['scheme'], key_info['keyval'])
     project_config['public_keys'][key] = key_metadata
 
   # Save the actual file.