ChangeLog, ntp_crypto.c:

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

bk: 3974a071XcuCbgtphHnmHuqABXKrnw

diff --git a/ChangeLog b/ChangeLog
index 5a38e6e7c1e1cc0c7639a0c09570025c3d4b7ce6..30c691b0184a9feeb64e2fc8b0648c4cc509f87e 100644 (file)
--- 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 778242c2bf230fdedd5f2573404bfb2e8a7949ae..3efb93aaeb4460aaa812b60e991824c040d09329 100644 (file)
--- 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);