diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h
index f69c30cb3f75..24c9322b2f97 100644
--- a/lib/libskey/skey.h
+++ b/lib/libskey/skey.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: skey.h,v 1.5 1998/07/26 21:58:46 mycroft Exp $	*/
+/*	$NetBSD: skey.h,v 1.6 2000/01/23 02:11:02 mycroft Exp $	*/
 
 /*
  * S/KEY v1.1b (skey.h)
@@ -73,5 +73,5 @@ int skey_haskey __ARGS ((const char *));
 int getskeyprompt __ARGS ((struct skey *, char *, char *));
 int atob8 __ARGS((char *, const char *));
 int btoa8 __ARGS((char *, const char *));
-int htoi __ARGS((char));
+int htoi __ARGS((int));
 
diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c
index 2c4a7abaecbc..7cbe88b6ae25 100644
--- a/lib/libskey/skeylogin.c
+++ b/lib/libskey/skeylogin.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: skeylogin.c,v 1.11 1999/08/24 09:01:36 mrg Exp $	*/
+/*	$NetBSD: skeylogin.c,v 1.12 2000/01/23 02:11:02 mycroft Exp $	*/
 
 /* S/KEY v1.1b (skeylogin.c)
  *
@@ -90,7 +90,8 @@ skeychallenge(mp,name, ss, sslen)
 	case -1:	/* File error */
 		return -1;
 	case 0:		/* Lookup succeeded, issue challenge */
-                (void)snprintf(ss, sslen, "s/key %d %s",mp->n - 1,mp->seed);
+                (void)snprintf(ss, (size_t)sslen, "s/key %d %s", mp->n - 1,
+		    mp->seed);
 		return 0;
 	case 1:		/* User not found */
 		fclose(mp->keyfile);
@@ -111,7 +112,7 @@ skeylookup(mp,name)
 	const char *name;
 {
 	int found;
-	int len;
+	size_t len;
 	long recstart = 0;
 	char *cp;
 	struct stat statbuf;
@@ -183,7 +184,6 @@ skeyverify(mp,response)
 	time_t now;
 	struct tm *tm;
 	char tbuf[27];
-	char *cp;
 
 	time(&now);
 	tm = localtime(&now);
@@ -226,7 +226,7 @@ skeyverify(mp,response)
 	}
 	rip(mp->buf);
 	mp->logname = strtok(mp->buf," \t");
-	cp = strtok(NULL," \t") ;
+	(void) strtok(NULL," \t");	/* ignore counter */
 	mp->seed = strtok(NULL," \t");
 	mp->val = strtok(NULL," \t");
 	/* And convert file value to hex for comparison */
diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c
index df38b9874ea3..e4ff8542c8c3 100644
--- a/lib/libskey/skeysubr.c
+++ b/lib/libskey/skeysubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: skeysubr.c,v 1.14 1999/07/02 15:45:23 simonb Exp $	*/
+/*	$NetBSD: skeysubr.c,v 1.15 2000/01/23 02:11:02 mycroft Exp $	*/
 
 /* S/KEY v1.1b (skeysubr.c)
  *
@@ -54,7 +54,7 @@ const char *passwd;	/* Password, any length */
 	sevenbit(buf);
 	MD4Init(&md);
 	MD4Update(&md, (unsigned char *) buf, buflen);
-	MD4Final((unsigned char *) hash, &md);
+	MD4Final((unsigned char *)(void *) hash, &md);
 
 	free(buf);
 
@@ -77,7 +77,7 @@ f(x)
 
 	MD4Init(&md);
 	MD4Update(&md, (unsigned char *) x, 8);
-	MD4Final((unsigned char *) hash, &md);
+	MD4Final((unsigned char *)(void *) hash, &md);
 
 	/* Fold 128 to 64 bits */
 	hash[0] ^= hash[2];
@@ -161,6 +161,7 @@ unset_term()
 	tcsetattr(fileno(stdin), TCSADRAIN, &oldtty);
 }
 
+/*ARGSUSED*/
 static void
 trapped(sig)
 	int sig;
@@ -223,7 +224,7 @@ btoa8(out, in)
 /* Convert hex digit to binary integer */
 int
 htoi(c)
-	char c;
+	int c;
 {
 	if ('0' <= c && c <= '9')
 		return c - '0';