From bccbeb7195c0a1b8bbc8a92f0c5f6e696c08cd8d Mon Sep 17 00:00:00 2001 From: ben Date: Wed, 3 Oct 2007 21:21:18 +0000 Subject: [PATCH] Replace mentions of SSH-2 I-Ds with references to the corresponding RFCs. git-svn-id: svn://svn.tartarus.org/sgt/putty@7759 cda61777-01e9-0310-a592-d414129be87e --- ssh.c | 6 +++--- sshdes.c | 2 +- sshdss.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ssh.c b/ssh.c index 63aecbc2..a4b78c4d 100644 --- a/ssh.c +++ b/ssh.c @@ -6677,7 +6677,7 @@ static void ssh2_msg_channel_request(Ssh ssh, struct Packet *pktin) int msglen = 0, core = FALSE; /* ICK: older versions of OpenSSH (e.g. 3.4p1) * 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 * 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); ssh->exitcode = 128 + signum; } else { - /* As per the drafts. */ + /* As per RFC 4254. */ char *sig; int 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[] = { {NULL, TS_SEP}, {"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 * required signals. */ {"SIGINT (Interrupt)", TS_SIGINT}, diff --git a/sshdes.c b/sshdes.c index 8c3ab72e..b12a91d5 100644 --- a/sshdes.c +++ b/sshdes.c @@ -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 - * draft-ietf-secsh-assignednumbers-04.txt, referring to + * RFC 4250, referring to * FIPS-46-3. ("Single DES (i.e., DES) will be permitted * for legacy systems only.") , but ssh.com support it and * apparently aren't the only people to do so, so we sigh diff --git a/sshdss.c b/sshdss.c index 22992fea..7c95d11b 100644 --- a/sshdss.c +++ b/sshdss.c @@ -231,14 +231,14 @@ static int dss_verifysig(void *key, char *sig, int siglen, #endif /* * 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 * containing two 160-bit integers end-to-end. Commercial SSH * can't be bothered with the header bit, and considers a DSA * signature blob to be _just_ the 40-byte string containing * the two 160-bit integers. We tell them apart by measuring * 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 */ getstring(&sig, &siglen, &p, &slen); -- 2.11.0