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

Replace mentions of SSH-2 I-Ds with references to the corresponding RFCs.

Browse Source 
[originally from svn r7759]
This commit is contained in:
Ben Harris 2007-10-03 21:21:18 +00:00
parent f8e7894e15
commit ca2b97f1d0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh.c
View File

@ -6677,7 +6677,7 @@ static void ssh2_msg_channel_request(Ssh ssh, struct Packet *pktin)
int msglen = 0, core = FALSE; int msglen = 0, core = FALSE;
/* ICK: older versions of OpenSSH (e.g. 3.4p1) /* ICK: older versions of OpenSSH (e.g. 3.4p1)
* provide an `int' for the signal, despite its * provide an `int' for the signal, despite its
* having been a `string' in the drafts since at * having been a `string' in the drafts of RFC 4254 since at
* least 2001. (Fixed in session.c 1.147.) Try to * least 2001. (Fixed in session.c 1.147.) Try to
* infer which we can safely parse it as. */ * infer which we can safely parse it as. */
{ {
@ -6720,7 +6720,7 @@ static void ssh2_msg_channel_request(Ssh ssh, struct Packet *pktin)
fmt_sig = dupprintf(" %d", signum); fmt_sig = dupprintf(" %d", signum);
ssh->exitcode = 128 + signum; ssh->exitcode = 128 + signum;
} else { } else {
/* As per the drafts. */ /* As per RFC 4254. */
char *sig; char *sig;
int siglen; int siglen;
ssh_pkt_getstring(pktin, &sig, &siglen); ssh_pkt_getstring(pktin, &sig, &siglen);
@ -9079,7 +9079,7 @@ static const struct telnet_special *ssh_get_specials(void *handle)
static const struct telnet_special ssh2_session_specials[] = { static const struct telnet_special ssh2_session_specials[] = {
{NULL, TS_SEP}, {NULL, TS_SEP},
{"Break", TS_BRK}, {"Break", TS_BRK},
/* These are the signal names defined by draft-ietf-secsh-connect-23. /* These are the signal names defined by RFC 4254.
* They include all the ISO C signals, but are a subset of the POSIX * They include all the ISO C signals, but are a subset of the POSIX
* required signals. */ * required signals. */
{"SIGINT (Interrupt)", TS_SIGINT}, {"SIGINT (Interrupt)", TS_SIGINT},

2
sshdes.c
View File

@ -959,7 +959,7 @@ static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
/* /*
* Single DES in SSH-2. "des-cbc" is marked as HISTORIC in * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
* draft-ietf-secsh-assignednumbers-04.txt, referring to * RFC 4250, referring to
* FIPS-46-3. ("Single DES (i.e., DES) will be permitted * FIPS-46-3. ("Single DES (i.e., DES) will be permitted
* for legacy systems only.") , but ssh.com support it and * for legacy systems only.") , but ssh.com support it and
* apparently aren't the only people to do so, so we sigh * apparently aren't the only people to do so, so we sigh

4
sshdss.c
View File

@ -231,14 +231,14 @@ static int dss_verifysig(void *key, char *sig, int siglen,
#endif #endif
/* /*
* Commercial SSH (2.0.13) and OpenSSH disagree over the format * Commercial SSH (2.0.13) and OpenSSH disagree over the format
* of a DSA signature. OpenSSH is in line with the IETF drafts: * of a DSA signature. OpenSSH is in line with RFC 4253:
* it uses a string "ssh-dss", followed by a 40-byte string * it uses a string "ssh-dss", followed by a 40-byte string
* containing two 160-bit integers end-to-end. Commercial SSH * containing two 160-bit integers end-to-end. Commercial SSH
* can't be bothered with the header bit, and considers a DSA * can't be bothered with the header bit, and considers a DSA
* signature blob to be _just_ the 40-byte string containing * signature blob to be _just_ the 40-byte string containing
* the two 160-bit integers. We tell them apart by measuring * the two 160-bit integers. We tell them apart by measuring
* the length: length 40 means the commercial-SSH bug, anything * the length: length 40 means the commercial-SSH bug, anything
* else is assumed to be IETF-compliant. * else is assumed to be RFC-compliant.
*/ */
if (siglen != 40) { /* bug not present; read admin fields */ if (siglen != 40) { /* bug not present; read admin fields */
getstring(&sig, &siglen, &p, &slen); getstring(&sig, &siglen, &p, &slen);