diff options
Diffstat (limited to 'lib/libcrypt')
| -rw-r--r-- | lib/libcrypt/Makefile | 6 | ||||
| -rw-r--r-- | lib/libcrypt/Makefile.depend | 3 | ||||
| -rw-r--r-- | lib/libcrypt/crypt.3 | 10 | ||||
| -rw-r--r-- | lib/libcrypt/crypt.c | 14 |
4 files changed, 12 insertions, 21 deletions
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index eea5572..7274e28 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -26,11 +26,7 @@ SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH .endif -# And the auth_getval() code and support. -.PATH: ${.CURDIR}/../libutil -SRCS+= auth.c property.c -.for sym in auth_getval property_find properties_read properties_free \ - MD4Init MD4Final MD4Update MD4Pad \ +.for sym in MD4Init MD4Final MD4Update MD4Pad \ MD5Init MD5Final MD5Update MD5Pad \ SHA256_Init SHA256_Final SHA256_Update \ SHA512_Init SHA512_Final SHA512_Update diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend index e54ec8c..16b5e42 100644 --- a/lib/libcrypt/Makefile.depend +++ b/lib/libcrypt/Makefile.depend @@ -5,9 +5,12 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DEP_MACHINE := ${.PARSEFILE:E} DIRDEPS = \ + gnu/lib/libgcc \ include \ include/arpa \ include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ .include <dirdeps.mk> diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3 index 949a7a7..f14a6eb 100644 --- a/lib/libcrypt/crypt.3 +++ b/lib/libcrypt/crypt.3 @@ -196,7 +196,7 @@ SHA-512 .Pp Other crypt formats may be easily added. An example salt would be: -.Bl -tag -offset indent +.Bl -tag -width 6n -offset indent .It Cm "$4$thesalt$rest" .El .Ss "Traditional" crypt: @@ -238,12 +238,6 @@ The .Fn crypt_set_format function sets the default encoding format according to the supplied .Fa string . -.Pp -The global default format can be set using the -.Pa /etc/auth.conf -file using the -.Va crypt_default -property. .Sh RETURN VALUES The .Fn crypt @@ -260,9 +254,7 @@ Otherwise, a value of 0 is returned. .Sh SEE ALSO .Xr login 1 , .Xr passwd 1 , -.Xr auth_getval 3 , .Xr getpass 3 , -.Xr auth.conf 5 , .Xr passwd 5 .Sh HISTORY A rotor-based diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index b949a48..bfcbb20 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -79,23 +79,23 @@ static const struct { } }; +#ifdef HAS_DES +#define CRYPT_DEFAULT "des" +#else +#define CRYPT_DEFAULT "md5" +#endif + static int crypt_type = -1; static void crypt_setdefault(void) { - char *def; size_t i; if (crypt_type != -1) return; - def = auth_getval("crypt_default"); - if (def == NULL) { - crypt_type = 0; - return; - } for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) { - if (strcmp(def, crypt_types[i].name) == 0) { + if (strcmp(CRYPT_DEFAULT, crypt_types[i].name) == 0) { crypt_type = (int)i; return; } |
