From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 18 Jul 2000 18:22:41 +0000 (-0000)
Subject: ChangeLog, ntp_crypto.c:
X-Git-Tag: NTP_4_0_99_K~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ca8a7c4775fcefa7d507ceb149e2f3920609105;p=thirdparty%2Fntp.git

ChangeLog, ntp_crypto.c:
  * ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup
  From Dave Mills

bk: 3974a071XcuCbgtphHnmHuqABXKrnw
---

diff --git a/ChangeLog b/ChangeLog
index 5a38e6e7c1..30c691b018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup
+	From Dave Mills
+
 2000-07-17  Harlan Stenn  <stenn@whimsy.udel.edu>
 
 	* html/confopt.htm (href): Document it.
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 778242c2bf..3efb93aaeb 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -66,20 +66,6 @@
 #define MAX_KEYLEN	1024	/* max key */
 #define MAX_ENCLEN	(ENCODED_CONTENT_LEN(1024)) /* max enc key */
 
-/*
- * Autokey protocol status codes
- */
-#define RV_OK		0x0	/* success */
-#define RV_TSP		0x1	/* invalid timestamp */
-#define RV_FSP		0x2	/* invalid filestamp */
-#define RV_PUB		0x3	/* missing public key */
-#define RV_KEY		0x4	/* invalid RSA modulus */
-#define RV_SIG		0x5	/* invalid signature length */
-#define RV_DH		0x6	/* invalid agreement parameters */
-#define RV_FIL		0x7	/* missing or corrupted key file */
-#define RV_DAT		0x8	/* missing or corrupted data */
-#define RV_DEC		0x9	/* PEM decoding error */
-
 /*
  * Private cryptodata in networ byte order.
  */
@@ -116,6 +102,20 @@ static	void	crypto_dh	P((char *));
 static	void	crypto_tai	P((char *));
 #endif /* PUBKEY */
 
+/*
+ * Autokey protocol status codes
+ */
+#define RV_OK		0x0	/* success */
+#define RV_TSP		0x1	/* invalid timestamp */
+#define RV_FSP		0x2	/* invalid filestamp */
+#define RV_PUB		0x3	/* missing public key */
+#define RV_KEY		0x4	/* invalid RSA modulus */
+#define RV_SIG		0x5	/* invalid signature length */
+#define RV_DH		0x6	/* invalid agreement parameters */
+#define RV_FIL		0x7	/* missing or corrupted key file */
+#define RV_DAT		0x8	/* missing or corrupted data */
+#define RV_DEC		0x9	/* PEM decoding error */
+
 
 /*
  * session_key - generate session key
@@ -293,7 +293,6 @@ crypto_recv(
 	u_int32 *pkt;		/* packet pointer */
 	struct autokey *ap;	/* autokey pointer */
 	struct cookie *cp;	/* cookie pointer */
-	struct value *vp;	/* value pointer */
 	int has_mac;		/* length of MAC field */
 	int authlen;		/* offset of MAC field */
 	int len;		/* extension field length */
@@ -303,6 +302,7 @@ crypto_recv(
 	u_int temp;
 #ifdef PUBKEY
 	R_SIGNATURE_CTX ctx;	/* signature context */
+	struct value *vp;	/* value pointer */
 	u_char dh_key[MAX_KEYLEN]; /* agreed key */
 	R_RSA_PUBLIC_KEY *kp;	/* temporary public key pointer */
 	u_int32 *pp;		/* packet pointer */
@@ -823,12 +823,12 @@ crypto_xmit(
 	struct peer *peer;	/* peer structure pointer */
 	struct autokey *ap;	/* autokey pointer */
 	struct cookie *cp;	/* cookie pointer */
-	struct value *vp;	/* value pointer */
 	int len;		/* extension field length */
 	u_int opcode;		/* extension field opcode */
 	int i;
 #ifdef PUBKEY
 	R_SIGNATURE_CTX ctx;	/* signature context */
+	struct value *vp;	/* value pointer */
 	int rval;		/* return value */
 	u_int temp;
 	int j;
@@ -888,11 +888,11 @@ crypto_xmit(
 	case CRYPTO_PRIV:
 	case CRYPTO_PRIV | CRYPTO_RESP:
 		cp = (struct cookie *)&xpkt[i + 2];
-		cp->tstamp = host.tstamp;
 		cp->key = htonl(cookie);
 		cp->siglen = 0;
 		len += 12;
 #ifdef PUBKEY
+		cp->tstamp = host.tstamp;
 		if (!crypto_flags)
 			break;
 		R_SignInit(&ctx, DA_MD5);