mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-01 11:32:48 -05:00
Spelling: standardise on "DSA", not "DSS".
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:
@ -593,7 +593,7 @@ struct rsa_key_thread_params {
|
||||
bool rsa_strong;
|
||||
union {
|
||||
RSAKey *key;
|
||||
struct dss_key *dsskey;
|
||||
struct dsa_key *dsakey;
|
||||
struct ecdsa_key *eckey;
|
||||
struct eddsa_key *edkey;
|
||||
};
|
||||
@ -610,7 +610,7 @@ static DWORD WINAPI generate_key_thread(void *param)
|
||||
PrimeGenerationContext *pgc = primegen_new_context(params->primepolicy);
|
||||
|
||||
if (params->keytype == DSA)
|
||||
dsa_generate(params->dsskey, params->key_bits, pgc, &prog.rec);
|
||||
dsa_generate(params->dsakey, params->key_bits, pgc, &prog.rec);
|
||||
else if (params->keytype == ECDSA)
|
||||
ecdsa_generate(params->eckey, params->curve_bits);
|
||||
else if (params->keytype == EDDSA)
|
||||
@ -645,7 +645,7 @@ struct MainDlgState {
|
||||
unsigned *entropy;
|
||||
union {
|
||||
RSAKey key;
|
||||
struct dss_key dsskey;
|
||||
struct dsa_key dsakey;
|
||||
struct ecdsa_key eckey;
|
||||
struct eddsa_key edkey;
|
||||
};
|
||||
@ -1158,7 +1158,7 @@ static void start_generating_key(HWND hwnd, struct MainDlgState *state)
|
||||
params->primepolicy = state->primepolicy;
|
||||
params->rsa_strong = state->rsa_strong;
|
||||
params->key = &state->key;
|
||||
params->dsskey = &state->dsskey;
|
||||
params->dsakey = &state->dsakey;
|
||||
|
||||
if (!CreateThread(NULL, 0, generate_key_thread,
|
||||
params, 0, &threadid)) {
|
||||
@ -1828,7 +1828,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg,
|
||||
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, PROGRESSRANGE, 0);
|
||||
if (state->ssh2) {
|
||||
if (state->keytype == DSA) {
|
||||
state->ssh2key.key = &state->dsskey.sshk;
|
||||
state->ssh2key.key = &state->dsakey.sshk;
|
||||
} else if (state->keytype == ECDSA) {
|
||||
state->ssh2key.key = &state->eckey.sshk;
|
||||
} else if (state->keytype == EDDSA) {
|
||||
|
@ -366,7 +366,7 @@ static void keylist_update_callback(
|
||||
ptrlen algname = get_string(src);
|
||||
const ssh_keyalg *alg = find_pubkey_alg_len(algname);
|
||||
|
||||
bool include_bit_count = (alg == &ssh_dss && alg == &ssh_rsa);
|
||||
bool include_bit_count = (alg == &ssh_dsa && alg == &ssh_rsa);
|
||||
|
||||
int wordnumber = 0;
|
||||
for (const char *p = fingerprint; *p; p++) {
|
||||
|
Reference in New Issue
Block a user