diff options
| -rw-r--r-- | lib/libskey/put.c | 10 | ||||
| -rw-r--r-- | lib/libskey/skey.h | 68 | ||||
| -rw-r--r-- | lib/libskey/skeylogin.c | 6 | ||||
| -rw-r--r-- | lib/libskey/skeysubr.c | 22 |
4 files changed, 45 insertions, 61 deletions
diff --git a/lib/libskey/put.c b/lib/libskey/put.c index 83d65d795cd..fe05e160a05 100644 --- a/lib/libskey/put.c +++ b/lib/libskey/put.c @@ -8,7 +8,7 @@ * * Dictionary lookup and extraction. * - * $Id: put.c,v 1.2 1996/09/27 15:38:58 millert Exp $ + * $Id: put.c,v 1.3 1996/09/30 04:10:43 millert Exp $ */ #include <stdio.h> @@ -17,10 +17,10 @@ #include <ctype.h> #include "skey.h" -static unsigned long extract __ARGS ((char *s, int start, int length)); -static void standard __ARGS ((char *word)); -static void insert __ARGS ((char *s, int x, int start, int length)); -static int wsrch __ARGS ((char *w, int low, int high)); +static unsigned long extract __P ((char *s, int start, int length)); +static void standard __P ((char *word)); +static void insert __P ((char *s, int x, int start, int length)); +static int wsrch __P ((char *w, int low, int high)); /* Dictionary for integer-word translations */ char Wp[2048][4] = { diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h index a7955d30e85..df85d92bfad 100644 --- a/lib/libskey/skey.h +++ b/lib/libskey/skey.h @@ -11,25 +11,9 @@ * * Main client header * - * $Id: skey.h,v 1.4 1996/09/29 21:27:01 millert Exp $ + * $Id: skey.h,v 1.5 1996/09/30 04:10:45 millert Exp $ */ -#if defined(__TURBOC__) || defined(__STDC__) || defined(LATTICE) -#define ANSIPROTO 1 -#endif - -#ifndef __ARGS -#ifdef ANSIPROTO -#define __ARGS(x) x -#else -#define __ARGS(x) () -#endif -#endif - -#ifdef SOLARIS -#define setpriority(x,y,z) z -#endif - /* Server-side data structure for reading keys file during login */ struct skey { @@ -50,28 +34,28 @@ struct mc int cnt; }; -void f __ARGS ((char *x)); -int keycrunch __ARGS ((char *result, char *seed, char *passwd)); -char *btoe __ARGS ((char *engout, char *c)); -char *put8 __ARGS ((char *out, char *s)); -int etob __ARGS ((char *out, char *e)); -void rip __ARGS ((char *buf)); -int skeychallenge __ARGS ((struct skey * mp, char *name, char *ss)); -int skeylookup __ARGS ((struct skey * mp, char *name)); -int skeyverify __ARGS ((struct skey * mp, char *response)); -int skeyzero __ARGS ((struct skey * mp, char *response)); -void sevenbit __ARGS ((char *s)); -void backspace __ARGS ((char *s)); -char *skipspace __ARGS ((char *s)); -char *readpass __ARGS ((char *buf, int n)); -char *readskey __ARGS ((char *buf, int n)); -int skey_authenticate __ARGS ((char *)); -int skey_passcheck __ARGS ((char *, char *)); -char *skey_keyinfo __ARGS ((char *)); -int skey_haskey __ARGS ((char *)); -int getskeyprompt __ARGS ((struct skey *, char *, char *)); -int atob8 __ARGS((char *, char *)); -int btoa8 __ARGS((char *, char *)); -int htoi __ARGS((char)); -const char * skey_get_algorithm __ARGS((void)); -char * skey_set_algorithm __ARGS((char *)); +void f __P((char *x)); +int keycrunch __P((char *result, char *seed, char *passwd)); +char *btoe __P((char *engout, char *c)); +char *put8 __P((char *out, char *s)); +int etob __P((char *out, char *e)); +void rip __P((char *buf)); +int skeychallenge __P((struct skey * mp, char *name, char *ss)); +int skeylookup __P((struct skey * mp, char *name)); +int skeyverify __P((struct skey * mp, char *response)); +int skeyzero __P((struct skey * mp, char *response)); +void sevenbit __P((char *s)); +void backspace __P((char *s)); +char *skipspace __P((char *s)); +char *readpass __P((char *buf, int n)); +char *readskey __P((char *buf, int n)); +int skey_authenticate __P((char *username)); +int skey_passcheck __P((char *username, char *passwd)); +char *skey_keyinfo __P((char *username)); +int skey_haskey __P((char *username)); +int getskeyprompt __P((struct skey *mp, char *name, char *prompt)); +int atob8 __P((char *out, char *in)); +int btoa8 __P((char *out, char *in)); +int htoi __P((char c)); +const char * skey_get_algorithm __P((void)); +char * skey_set_algorithm __P((char *new)); diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c index b5972f674a2..38cd82c5df9 100644 --- a/lib/libskey/skeylogin.c +++ b/lib/libskey/skeylogin.c @@ -8,7 +8,7 @@ * * S/KEY verification check, lookups, and authentication. * - * $Id: skeylogin.c,v 1.6 1996/09/29 23:35:08 millert Exp $ + * $Id: skeylogin.c,v 1.7 1996/09/30 04:10:46 millert Exp $ */ #include <sys/param.h> @@ -33,8 +33,8 @@ #define _PATH_KEYFILE "/etc/skeykeys" -char *skipspace __ARGS((char *)); -int skeylookup __ARGS((struct skey *, char *)); +char *skipspace __P((char *)); +int skeylookup __P((struct skey *, char *)); /* Issue a skey challenge for user 'name'. If successful, * fill in the caller's skey structure and return 0. If unsuccessful diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c index 943978fc5eb..e6a1e43fc22 100644 --- a/lib/libskey/skeysubr.c +++ b/lib/libskey/skeysubr.c @@ -10,7 +10,7 @@ * * S/KEY misc routines. * - * $Id: skeysubr.c,v 1.5 1996/09/29 23:35:07 millert Exp $ + * $Id: skeysubr.c,v 1.6 1996/09/30 04:10:47 millert Exp $ */ #include <stdio.h> @@ -29,14 +29,14 @@ #define SKEY_HASH_DEFAULT 1 #endif -static void trapped __ARGS((int sig)); -static void f_md4 __ARGS ((char *x)); -static void f_md5 __ARGS ((char *x)); -static void f_sha1 __ARGS ((char *x)); -static void skey_echo __ARGS ((int action)); -static int keycrunch_md4 __ARGS ((char *result, char *seed, char *passwd)); -static int keycrunch_md5 __ARGS ((char *result, char *seed, char *passwd)); -static int keycrunch_sha1 __ARGS ((char *result, char *seed, char *passwd)); +static void trapped __P((int sig)); +static void f_md4 __P((char *x)); +static void f_md5 __P((char *x)); +static void f_sha1 __P((char *x)); +static void skey_echo __P((int action)); +static int keycrunch_md4 __P((char *result, char *seed, char *passwd)); +static int keycrunch_md5 __P((char *result, char *seed, char *passwd)); +static int keycrunch_sha1 __P((char *result, char *seed, char *passwd)); /* Current hash type (index into skey_hash_types array) */ static int skey_hash_type = SKEY_HASH_DEFAULT; @@ -48,8 +48,8 @@ static int skey_hash_type = SKEY_HASH_DEFAULT; #define SKEY_ALGORITH_MAX 3 struct skey_algorithm_table { const char *name; - int (*keycrunch) __ARGS((char *, char *, char *)); - void (*f) __ARGS((char *)); + int (*keycrunch) __P((char *, char *, char *)); + void (*f) __P((char *)); }; static struct skey_algorithm_table skey_algorithm_table[] = { { "md4", keycrunch_md4, f_md4 }, |