# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1298815052 0
# Node ID 3aa74a4d83ae6b16f99cf60fc2060e02265b9619
# Parent  2d896267f16d9c402514444d8769da266a1d652a
Refer to RFCs rather than drafts, update some section references

diff -r 2d896267f16d -r 3aa74a4d83ae common-kex.c
--- a/common-kex.c	Sun Feb 27 13:12:17 2011 +0000
+++ b/common-kex.c	Sun Feb 27 13:57:32 2011 +0000
@@ -272,8 +272,8 @@
 }
 
 /* Generate the actual encryption/integrity keys, using the results of the
- * key exchange, as specified in section 5.2 of the IETF secsh-transport
- * draft. This occurs after the DH key-exchange.
+ * key exchange, as specified in section 7.2 of the transport rfc 4253.
+ * This occurs after the DH key-exchange.
  *
  * ses.newkeys is the new set of keys which are generated, these are only
  * taken into use after both sides have sent a newkeys message */
@@ -532,7 +532,7 @@
 }
 
 /* Initialises and generate one side of the diffie-hellman key exchange values.
- * See the ietf-secsh-transport draft, section 6, for details */
+ * See the transport rfc 4253 section 8 for details */
 /* dh_pub and dh_priv MUST be already initialised */
 void gen_kexdh_vals(mp_int *dh_pub, mp_int *dh_priv) {
 
diff -r 2d896267f16d -r 3aa74a4d83ae dropbearkey.c
--- a/dropbearkey.c	Sun Feb 27 13:12:17 2011 +0000
+++ b/dropbearkey.c	Sun Feb 27 13:57:32 2011 +0000
@@ -23,7 +23,7 @@
  * SOFTWARE. */
 
 /* The format of the keyfiles is basically a raw dump of the buffer. Data types
- * are specified in the transport draft - string is a 32-bit len then the
+ * are specified in the transport rfc 4253 - string is a 32-bit len then the
  * non-null-terminated string, mp_int is a 32-bit len then the bignum data.
  * The actual functions are buf_put_rsa_priv_key() and buf_put_dss_priv_key()
 
diff -r 2d896267f16d -r 3aa74a4d83ae svr-kex.c
--- a/svr-kex.c	Sun Feb 27 13:12:17 2011 +0000
+++ b/svr-kex.c	Sun Feb 27 13:57:32 2011 +0000
@@ -70,7 +70,7 @@
  * that, the session hash is calculated, and signed with RSA or DSS. The
  * result is sent to the client. 
  *
- * See the ietf-secsh-transport draft, section 6, for details */
+ * See the transport rfc 4253 section 8 for details */
 static void send_msg_kexdh_reply(mp_int *dh_e) {
 
 	DEF_MP_INT(dh_y);
diff -r 2d896267f16d -r 3aa74a4d83ae sysoptions.h
--- a/sysoptions.h	Sun Feb 27 13:12:17 2011 +0000
+++ b/sysoptions.h	Sun Feb 27 13:57:32 2011 +0000
@@ -99,6 +99,7 @@
 #define MAX_PROPOSED_ALGO 20
 
 /* size/count limits */
+/* From transport rfc */
 #define MIN_PACKET_LEN 16
 
 #define RECV_MAX_PACKET_LEN (MAX(35000, ((RECV_MAX_PAYLOAD_LEN)+100)))
@@ -123,7 +124,7 @@
 #define MAX_PRIVKEY_SIZE 1700
 
 /* The maximum size of the bignum portion of the kexhash buffer */
-/* Sect. 8 of the transport draft, K_S + e + f + K */
+/* Sect. 8 of the transport rfc 4253, K_S + e + f + K */
 #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130)
 
 #define DROPBEAR_MAX_SOCKS 2 /* IPv4, IPv6 are all we'll get for now. Revisit