jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-02 04:13:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Prevent namespace pollution cause by this library by splitting to

Browse Source 
API and non-API functions and giving _sk_ prefix for all non-API
functions. Old names will be available by _SKEY_INTERNAL define
it allows not change anything in keyinit & key, only -D_SKEY_INTERNAL required.
Staticise some things.
This commit is contained in:
Andrey A. Chernov 1996-10-17 15:22:46 +00:00
parent 590b04e005
commit 811a3c8d54
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=18981
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libskey/Makefile
View File

@ -5,7 +5,7 @@ SRCS= skeyaccess.c put.c skey_crypt.c skey_getpass.c skeylogin.c skeysubr.c
MAN1= skey.1
MAN5= skey.access.5
CFLAGS+=-DPERMIT_CONSOLE -I${.CURDIR}
CFLAGS+=-DPERMIT_CONSOLE -D_SKEY_INTERNAL -I${.CURDIR}
beforeinstall:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/skey.h \

2
lib/libskey/put.c
View File

@ -10,7 +10,7 @@ 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] = {
static char Wp[2048][4] = {
"A",
"ABE",
"ACE",

23
lib/libskey/skey.h
View File

@ -14,6 +14,7 @@ struct skey {
long recstart; /*needed so reread of buffer is efficient*/
};
#ifdef _SKEY_INTERNAL
/* Client-side structure for scanning data stream for challenge */
struct mc {
char buf[256];
@ -21,6 +22,18 @@ struct mc {
int cnt;
};
#define atob8 _sk_atob8
#define btoa8 _sk_btoa8
#define btoe _sk_btoe
#define etob _sk_etob
#define f _sk_f
#define htoi _sk_htoi
#define keycrunch _sk_keycrunch
#define put8 _sk_put8
#define readpass _sk_readpass
#define rip _sk_rip
#define sevenbit _sk_sevenbit
void f __P((char *x));
int keycrunch __P((char *result,char *seed,char *passwd));
char *btoe __P((char *engout,char *c));
@ -30,14 +43,16 @@ int btoa8 __P((char *out, char *in));
int htoi __P((char c));
int etob __P((char *out,char *e));
void sevenbit __P((char *s));
char *readpass __P((char *buf, int n));
void rip __P((char *buf));
int skeychallenge __P((struct skey *mp,char *name, char *challenge));
int skeyinfo __P((struct skey *mp, char* name, char *ss));
int skeylookup __P((struct skey *mp,char *name));
int skeyverify __P((struct skey *mp,char *response));
#endif /* _SKEY_INTERNAL */
/* Simplified application programming interface. */
#include <pwd.h>
int skeylookup __P((struct skey *mp,char *name));
int skeyverify __P((struct skey *mp,char *response));
int skeychallenge __P((struct skey *mp,char *name, char *challenge));
int skeyinfo __P((struct skey *mp, char* name, char *ss));
int skeyaccess __P((char *user, char *port, char *host, char *addr));
char *skey_getpass __P((char *prompt, struct passwd *pwd, int pwok));
char *skey_crypt __P((char *pp, char *salt, struct passwd *pwd, int pwok));

4
lib/libskey/skeylogin.c
View File

@ -22,8 +22,7 @@
#include "skey.h"
#include "pathnames.h"
char *skipspace();
int skeylookup __P((struct skey *mp,char *name));
static char *skipspace();
#define setpriority(x,y,z) /* nothing */
@ -296,6 +295,7 @@ register char *out,*in;
return 0;
}
static
char *
skipspace(cp)
register char *cp;