nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Spelling: standardise on "DSA", not "DSS".

Browse Source 
This code base has always been a bit confused about which spelling it
likes to use to refer to that signature algorithm. The SSH protocol id
is "ssh-dss". But everyone I know refers to it as the Digital
Signature _Algorithm_, not the Digital Signature _Standard_.

When I moved everything down into the crypto subdir, I took the
opportunity to rename sshdss.c to dsa.c. Now I'm doing the rest of the
job: all internal identifiers and code comments refer to DSA, and the
spelling "dss" only survives in externally visible identifiers that
have to remain constant.

(Such identifiers include the SSH protocol id, and also the string id
used to identify the key type in PuTTY's own host key cache. We can't
change the latter without causing everyone a backwards-compatibility
headache, and if we _did_ ever decide to do that, we'd surely want to
do a much more thorough job of making the cache format more sensible!)
This commit is contained in:
Simon Tatham
2021-04-22 18:28:35 +01:00
parent 419e5e2230
commit 1c039d0a7b
12 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
import.c
View File

@ -775,7 +775,7 @@ static ssh2_userkey *openssh_pem_read(
*/
assert(privptr > 0); /* should have bombed by now if not */
retkey = snew(ssh2_userkey);
alg = (key->keytype == OP_RSA ? &ssh_rsa : &ssh_dss);
alg = (key->keytype == OP_RSA ? &ssh_rsa : &ssh_dsa);
retkey->key = ssh_key_new_priv(
alg, make_ptrlen(blob->u, privptr),
make_ptrlen(blob->u+privptr, blob->len-privptr));
@ -841,11 +841,11 @@ static bool openssh_pem_write(
* line.
*/
if (ssh_key_alg(key->key) == &ssh_rsa ||
ssh_key_alg(key->key) == &ssh_dss) {
ssh_key_alg(key->key) == &ssh_dsa) {
strbuf *seq;
/*
* The RSA and DSS handlers share some code because the two
* The RSA and DSA handlers share some code because the two
* key types have very similar ASN.1 representations, as a
* plain SEQUENCE of big integers. So we set up a list of
* bignums per key type and then construct the actual blob in
@ -1634,7 +1634,7 @@ static bool openssh_auto_write(
* assume that anything not in that fixed list is newer, and hence
* will use the new format.
*/
if (ssh_key_alg(key->key) == &ssh_dss ||
if (ssh_key_alg(key->key) == &ssh_dsa ||
ssh_key_alg(key->key) == &ssh_rsa ||
ssh_key_alg(key->key) == &ssh_ecdsa_nistp256 ||
ssh_key_alg(key->key) == &ssh_ecdsa_nistp384 ||
@ -2111,7 +2111,7 @@ static ssh2_userkey *sshcom_read(
goto error;
}
alg = &ssh_dss;
alg = &ssh_dsa;
put_stringz(blob, "ssh-dss");
put_mp_ssh2_from_string(blob, p);
put_mp_ssh2_from_string(blob, q);
@ -2202,7 +2202,7 @@ static bool sshcom_write(
nnumbers = 6;
initial_zero = false;
type = "if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}";
} else if (ssh_key_alg(key->key) == &ssh_dss) {
} else if (ssh_key_alg(key->key) == &ssh_dsa) {
ptrlen p, q, g, y, x;
/*