diff options
| author |   sebastia <sebastia@openbsd.org> | 2014-08-27 06:51:35 +0000 |
|---|---|---|
| committer | sebastia <sebastia@openbsd.org> | 2014-08-27 06:51:35 +0000 |
| commit | 1a8578214ca5095998cec83849879896b01b0bcf (patch) | |
| tree | 0d30feea92698645e1181168fbccb6891896608b /usr.sbin/user | |
| parent | rxr ioctl handling. (diff) | |
| download | wireguard-openbsd-1a8578214ca5095998cec83849879896b01b0bcf.tar.xz wireguard-openbsd-1a8578214ca5095998cec83849879896b01b0bcf.zip | |
Add missing capability to handle new $2b version of blowfish password
encryption for usermod and friends.
OK millert@, seems reasonable for now tedu@
Diffstat (limited to 'usr.sbin/user')
| -rw-r--r-- | usr.sbin/user/user.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c index df04e810ae2..394710bf079 100644 --- a/usr.sbin/user/user.c +++ b/usr.sbin/user/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.99 2014/07/20 01:38:40 guenther Exp $ */ +/* $OpenBSD: user.c,v 1.100 2014/08/27 06:51:35 sebastia Exp $ */ /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */ /* @@ -876,11 +876,13 @@ typedef struct passwd_type_t { int length; /* length of password */ } passwd_type_t; -#define BLF "$2a" -#define MD5 "$1" -#define DES "" +#define NBLF "$2b" +#define BLF "$2a" +#define MD5 "$1" +#define DES "" static passwd_type_t passwd_types[] = { + { NBLF, 3, 54 }, /* Blowfish bcrypt version 2b */ { BLF, 3, 54 }, /* Blowfish */ { MD5, 2, 34 }, /* MD5 */ { DES, 0, DES_Len }, /* standard DES */ @@ -897,7 +899,8 @@ valid_password_length(char *newpasswd) if (strncmp(newpasswd, pwtp->type, pwtp->desc_length) == 0) { char *p; - if (strcmp(pwtp->type, BLF) != 0) { + if (strcmp(pwtp->type, BLF) != 0 && + strcmp(pwtp->type, NBLF) != 0) { return strlen(newpasswd) == pwtp->length; } /* Skip first three `$'. */ |