nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix text name of hmac-sha1-96-buggy.

Browse Source 
I carefully set up separate mechanisms for the "-96" suffix on the
hash name and the "bug-compatible" in parens after it, so that the
latter could share its parens with annotations from the underlying
hash. And then I forgot to _use_ the second mechanism!

Also added ssh2_mac_text_name to the testcrypt API so I could check it
easily. The result before this fix:

>>> ssh2_mac_text_name(ssh2_mac_new("hmac_sha1_96_buggy", None))
'HMAC-SHA-1-96 (bug-compatible) (unaccelerated)'

And after, which is what I intended all along:

>>> ssh2_mac_text_name(ssh2_mac_new("hmac_sha1_96_buggy", None))
'HMAC-SHA-1-96 (bug-compatible, unaccelerated)'
This commit is contained in:
Simon Tatham 2020-01-26 16:46:16 +00:00
parent 404f558705
commit 600bf247d3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshhmac.c
View File

@ -195,7 +195,7 @@ const ssh2_macalg ssh_hmac_sha1_96 = {
};
const struct hmac_extra ssh_hmac_sha1_buggy_extra = {
&ssh_sha1, " (bug-compatible)"
&ssh_sha1, "", "bug-compatible"
};
const ssh2_macalg ssh_hmac_sha1_buggy = {
@ -206,7 +206,7 @@ const ssh2_macalg ssh_hmac_sha1_buggy = {
};
const struct hmac_extra ssh_hmac_sha1_96_buggy_extra = {
&ssh_sha1, "-96 (bug-compatible)"
&ssh_sha1, "-96", "bug-compatible"
};
const ssh2_macalg ssh_hmac_sha1_96_buggy = {

1
testcrypt.h
View File

@ -138,6 +138,7 @@ FUNC2(void, ssh2_mac_setkey, val_mac, val_string_ptrlen)
FUNC1(void, ssh2_mac_start, val_mac)
FUNC2(void, ssh2_mac_update, val_mac, val_string_ptrlen)
FUNC1(val_string, ssh2_mac_genresult, val_mac)
FUNC1(val_string_asciz_const, ssh2_mac_text_name, val_mac)
/*
* The ssh_key abstraction. All the uses of BinarySink and