summaryrefslogtreecommitdiff
path: root/lib/libntp/authdecrypt.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>1998-03-06 18:17:13 +0000
committerchristos <christos@NetBSD.org>1998-03-06 18:17:13 +0000
commit50e0331ef5b2b92b6cf95cb1b8d72ceb689e017f (patch)
treeba11a87ed0efcdfc69bed151dda9c4f20bd17c5c /lib/libntp/authdecrypt.c
parenta5e6bce521ae3e0d81a27a4438b098633a54b0f7 (diff)
Resolve conflicts.
Diffstat (limited to 'lib/libntp/authdecrypt.c')
-rw-r--r--lib/libntp/authdecrypt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libntp/authdecrypt.c b/lib/libntp/authdecrypt.c
index e04934ab371..0558b0a82e6 100644
--- a/lib/libntp/authdecrypt.c
+++ b/lib/libntp/authdecrypt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: authdecrypt.c,v 1.2 1998/01/09 03:15:54 perry Exp $ */
+/* $NetBSD: authdecrypt.c,v 1.3 1998/03/06 18:17:13 christos Exp $ */
/*
* authdecrypt - routine to decrypt a packet to see if this guy knows our key.
@@ -21,9 +21,9 @@
/*
* Imported from the key data base module
*/
-extern u_long cache_keyid; /* cached key ID */
-extern u_long DEScache_dkeys[]; /* cached decryption keys */
-extern u_long DESzerodkeys[]; /* zero key decryption keys */
+extern u_int32 cache_keyid; /* cached key ID */
+extern u_int32 DEScache_dkeys[]; /* cached decryption keys */
+extern u_int32 DESzerodkeys[]; /* zero key decryption keys */
/*
* Stat counters, imported from data base module
@@ -33,7 +33,7 @@ extern u_int32 authkeyuncached;
int
DESauthdecrypt(keyno, pkt, length)
- u_long keyno;
+ u_int32 keyno;
const u_int32 *pkt;
int length; /* length of variable data in octets */
{