diff options
| author | Hans Nilsson <[email protected]> | 2015-10-13 09:21:02 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-16 12:38:25 +0200 |
| commit | 01d1e4dc9a6e7ea958683ab419dea38bf576a39f (patch) | |
| tree | e61b19cd3e59a2f71f8060fd23b569d1f0480eaa /lib/ssh/src/ssh_auth.erl | |
| parent | ba49561cf3e2167acd5457de93b05e772f2fb16a (diff) | |
| download | otp-01d1e4dc9a6e7ea958683ab419dea38bf576a39f.tar.gz otp-01d1e4dc9a6e7ea958683ab419dea38bf576a39f.tar.bz2 otp-01d1e4dc9a6e7ea958683ab419dea38bf576a39f.zip | |
ssh, public_key: Change EC Public Key representation to what was intended
Diffstat (limited to 'lib/ssh/src/ssh_auth.erl')
| -rw-r--r-- | lib/ssh/src/ssh_auth.erl | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl index 0c16e19701..8c6ffceb4b 100644 --- a/lib/ssh/src/ssh_auth.erl +++ b/lib/ssh/src/ssh_auth.erl @@ -500,16 +500,15 @@ decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary, , "ssh-dss") -> {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}}; decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary, - ?UINT32(Len1), Id:Len1/binary, %% Id = <<"nistp256">> for example + ?UINT32(Len1), IdB:Len1/binary, %% Id = <<"nistp256">> for example ?UINT32(Len2), Blob:Len2/binary>>, - Curve) -> - Id = - case Curve of - "ecdsa-sha2-nistp256" -> <<"nistp256">>; - "ecdsa-sha2-nistp384" -> <<"nistp384">>; - "ecdsa-sha2-nistp521" -> <<"nistp521">> - end, - {ok, {#'ECPoint'{point=Blob}, Id}}; + "ecdsa-sha2-" ++ IdS) -> + case binary_to_list(IdB) of + IdS -> + {ok, {#'ECPoint'{point=Blob}, {namedCurve,public_key:ssh_curvename2oid(IdB)}} }; + _ -> + {error, bad_format} + end; decode_public_key_v2(_, _) -> {error, bad_format}. |