Importing usr.bin/pwhash
No Minix-specific changes needed. Change-Id: I7de666c3e010fef710805942c79b5674fea1d63c
This commit is contained in:
parent
6ea7f916db
commit
93ce9b1174
|
@ -438,6 +438,7 @@
|
||||||
./usr/bin/progressbar minix-sys
|
./usr/bin/progressbar minix-sys
|
||||||
./usr/bin/pr_routes minix-sys
|
./usr/bin/pr_routes minix-sys
|
||||||
./usr/bin/ps minix-sys
|
./usr/bin/ps minix-sys
|
||||||
|
./usr/bin/pwhash minix-sys
|
||||||
./usr/bin/ramdisk minix-sys
|
./usr/bin/ramdisk minix-sys
|
||||||
./usr/bin/ranlib minix-sys binutils
|
./usr/bin/ranlib minix-sys binutils
|
||||||
./usr/bin/rarpd minix-sys
|
./usr/bin/rarpd minix-sys
|
||||||
|
@ -2006,6 +2007,7 @@
|
||||||
./usr/man/man1/profile.1 minix-sys
|
./usr/man/man1/profile.1 minix-sys
|
||||||
./usr/man/man1/ps.1 minix-sys
|
./usr/man/man1/ps.1 minix-sys
|
||||||
./usr/man/man1/pwd.1 minix-sys
|
./usr/man/man1/pwd.1 minix-sys
|
||||||
|
./usr/man/man1/pwhash.1 minix-sys
|
||||||
./usr/man/man1/ranlib.1 minix-sys binutils
|
./usr/man/man1/ranlib.1 minix-sys binutils
|
||||||
./usr/man/man1/rcp.1 minix-sys
|
./usr/man/man1/rcp.1 minix-sys
|
||||||
./usr/man/man1/read.1 minix-sys
|
./usr/man/man1/read.1 minix-sys
|
||||||
|
|
|
@ -192,6 +192,7 @@
|
||||||
2013/10/24 12:00:00,usr.bin/pr
|
2013/10/24 12:00:00,usr.bin/pr
|
||||||
2013/10/17 12:00:00,usr.bin/printenv
|
2013/10/17 12:00:00,usr.bin/printenv
|
||||||
2012/10/17 12:00:00,usr.bin/printf
|
2012/10/17 12:00:00,usr.bin/printf
|
||||||
|
2013/10/24 12:00:00,usr.bin/pwhash
|
||||||
2013/09/28 12:00:00,usr.bin/rev
|
2013/09/28 12:00:00,usr.bin/rev
|
||||||
2010/02/19 16:35:27,usr.bin/sed
|
2010/02/19 16:35:27,usr.bin/sed
|
||||||
2010/05/27 08:40:19,usr.bin/seq
|
2010/05/27 08:40:19,usr.bin/seq
|
||||||
|
|
|
@ -20,7 +20,7 @@ SUBDIR= \
|
||||||
\
|
\
|
||||||
nbperf newgrp nice nl nohup nvi \
|
nbperf newgrp nice nl nohup nvi \
|
||||||
passwd pr \
|
passwd pr \
|
||||||
printenv printf \
|
printenv printf pwhash \
|
||||||
rev \
|
rev \
|
||||||
\
|
\
|
||||||
shuffle sed seq \
|
shuffle sed seq \
|
||||||
|
|
13
usr.bin/pwhash/Makefile
Normal file
13
usr.bin/pwhash/Makefile
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# $NetBSD: Makefile,v 1.7 2009/04/14 22:15:25 lukem Exp $
|
||||||
|
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
|
||||||
|
|
||||||
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
|
PROG= pwhash
|
||||||
|
|
||||||
|
CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
|
||||||
|
|
||||||
|
DPADD+= ${LIBCRYPT} ${LIBUTIL}
|
||||||
|
LDADD+= -lcrypt -lutil
|
||||||
|
|
||||||
|
.include <bsd.prog.mk>
|
96
usr.bin/pwhash/pwhash.1
Normal file
96
usr.bin/pwhash/pwhash.1
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
.\" $NetBSD: pwhash.1,v 1.7 2009/10/16 08:09:12 wiz Exp $
|
||||||
|
.\" $OpenBSD: encrypt.1,v 1.16 2000/11/09 17:52:07 aaron Exp $
|
||||||
|
.\"
|
||||||
|
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
|
||||||
|
.\"
|
||||||
|
.\" Redistribution and use in source and binary forms, with or without
|
||||||
|
.\" modification, are permitted provided that the following conditions
|
||||||
|
.\" are met:
|
||||||
|
.\" 1. Redistributions of source code must retain the above copyright
|
||||||
|
.\" notice, this list of conditions and the following disclaimer.
|
||||||
|
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
.\" notice, this list of conditions and the following disclaimer in the
|
||||||
|
.\" documentation and/or other materials provided with the distribution.
|
||||||
|
.\"
|
||||||
|
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
|
||||||
|
.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
|
||||||
|
.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
.\" SUCH DAMAGE.
|
||||||
|
.\"
|
||||||
|
.Dd October 16, 2009
|
||||||
|
.Dt PWHASH 1
|
||||||
|
.Os
|
||||||
|
.Sh NAME
|
||||||
|
.Nm pwhash
|
||||||
|
.Nd hashes passwords from the command line or standard input
|
||||||
|
.Sh SYNOPSIS
|
||||||
|
.Nm pwhash
|
||||||
|
.Op Fl km
|
||||||
|
.Op Fl b Ar rounds
|
||||||
|
.Op Fl S Ar rounds
|
||||||
|
.Op Fl s Ar salt
|
||||||
|
.Op Fl p | Ar string
|
||||||
|
.Sh DESCRIPTION
|
||||||
|
.Nm
|
||||||
|
prints the encrypted form of
|
||||||
|
.Ar string
|
||||||
|
to the standard output.
|
||||||
|
This is mostly useful for encrypting passwords from within scripts.
|
||||||
|
.Pp
|
||||||
|
The options are as follows:
|
||||||
|
.Bl -tag -width Ds
|
||||||
|
.It Fl b Ar rounds
|
||||||
|
Encrypt the string using Blowfish hashing with the specified
|
||||||
|
.Ar rounds .
|
||||||
|
.It Fl k
|
||||||
|
Run in
|
||||||
|
.Xr makekey 8
|
||||||
|
compatible mode.
|
||||||
|
A single combined key (eight chars) and salt (two chars) with no
|
||||||
|
intermediate space are read from standard input and the DES encrypted
|
||||||
|
result is written to standard output without a terminating newline.
|
||||||
|
.It Fl m
|
||||||
|
Encrypt the string using MD5.
|
||||||
|
.It Fl p
|
||||||
|
Prompt for a single string with echo turned off.
|
||||||
|
.It Fl S Ar rounds
|
||||||
|
Encrypt the salt with HMAC-SHA1 using the password as key and the specified
|
||||||
|
.Ar rounds
|
||||||
|
as a hint for the number of iterations.
|
||||||
|
.It Fl s Ar salt
|
||||||
|
Encrypt the string using DES, with the specified
|
||||||
|
.Ar salt .
|
||||||
|
.El
|
||||||
|
.Pp
|
||||||
|
If no
|
||||||
|
.Ar string
|
||||||
|
is specified,
|
||||||
|
.Nm
|
||||||
|
reads one string per line from standard input, encrypting each one
|
||||||
|
with the chosen algorithm from above.
|
||||||
|
In the event that no specific algorithm is given as a command line option,
|
||||||
|
the algorithm specified in the default class in
|
||||||
|
.Pa /etc/passwd.conf
|
||||||
|
will be used.
|
||||||
|
.Pp
|
||||||
|
For MD5 and Blowfish a new random salt is automatically generated for each
|
||||||
|
password.
|
||||||
|
.Pp
|
||||||
|
Specifying the
|
||||||
|
.Ar string
|
||||||
|
on the command line should be discouraged; using the
|
||||||
|
standard input is more secure.
|
||||||
|
.Sh FILES
|
||||||
|
.Bl -tag -width /etc/passwd.conf -compact
|
||||||
|
.It Pa /etc/passwd.conf
|
||||||
|
.El
|
||||||
|
.Sh SEE ALSO
|
||||||
|
.Xr crypt 3 ,
|
||||||
|
.Xr passwd.conf 5
|
243
usr.bin/pwhash/pwhash.c
Normal file
243
usr.bin/pwhash/pwhash.c
Normal file
|
@ -0,0 +1,243 @@
|
||||||
|
/* $NetBSD: pwhash.c,v 1.15 2011/09/16 15:39:28 joerg Exp $ */
|
||||||
|
/* $OpenBSD: encrypt.c,v 1.16 2002/02/16 21:27:45 millert Exp $ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1996, Jason Downs. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
|
||||||
|
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
|
||||||
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
|
||||||
|
#ifndef lint
|
||||||
|
__RCSID("$NetBSD: pwhash.c,v 1.15 2011/09/16 15:39:28 joerg Exp $");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <err.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <pwd.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <login_cap.h>
|
||||||
|
#include <util.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Very simple little program, for encrypting passwords from the command
|
||||||
|
* line. Useful for scripts and such.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define DO_MAKEKEY 0
|
||||||
|
#define DO_DES 1
|
||||||
|
#define DO_MD5 2
|
||||||
|
#define DO_BLF 3
|
||||||
|
#define DO_SHA1 4
|
||||||
|
|
||||||
|
__dead static void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
|
||||||
|
(void)fprintf(stderr,
|
||||||
|
"Usage: %s [-km] [-b rounds] [-S rounds] [-s salt] [-p | string]\n",
|
||||||
|
getprogname());
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *
|
||||||
|
trim(char *line)
|
||||||
|
{
|
||||||
|
char *ptr;
|
||||||
|
|
||||||
|
for (ptr = &line[strlen(line) - 1]; ptr > line; ptr--) {
|
||||||
|
if (!isspace((unsigned char)*ptr))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ptr[1] = '\0';
|
||||||
|
|
||||||
|
for (ptr = line; *ptr && isspace((unsigned char)*ptr); ptr++)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
print_passwd(char *string, int operation, const char *extra)
|
||||||
|
{
|
||||||
|
char buf[_PASSWORD_LEN];
|
||||||
|
char option[LINE_MAX], *key, *opt;
|
||||||
|
int error = 0;
|
||||||
|
const char *salt = buf;
|
||||||
|
|
||||||
|
switch(operation) {
|
||||||
|
case DO_MAKEKEY:
|
||||||
|
/*
|
||||||
|
* makekey mode: parse string into separate DES key and salt.
|
||||||
|
*/
|
||||||
|
if (strlen(string) != 10) {
|
||||||
|
/* To be compatible... */
|
||||||
|
error = EFTYPE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
salt = &string[8];
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DO_MD5:
|
||||||
|
error = pw_gensalt(buf, _PASSWORD_LEN, "md5", extra);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DO_SHA1:
|
||||||
|
error = pw_gensalt(buf, _PASSWORD_LEN, "sha1", extra);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DO_BLF:
|
||||||
|
error = pw_gensalt(buf, _PASSWORD_LEN, "blowfish", extra);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DO_DES:
|
||||||
|
salt = extra;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
pw_getconf(option, sizeof(option), "default", "localcipher");
|
||||||
|
opt = option;
|
||||||
|
key = strsep(&opt, ",");
|
||||||
|
error = pw_gensalt(buf, _PASSWORD_LEN, key, opt);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error)
|
||||||
|
err(1, "Cannot generate salt");
|
||||||
|
|
||||||
|
(void)fputs(crypt(string, salt), stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
int opt;
|
||||||
|
int operation = -1;
|
||||||
|
int prompt = 0;
|
||||||
|
const char *extra = NULL; /* Store salt or number of rounds */
|
||||||
|
|
||||||
|
setprogname(argv[0]);
|
||||||
|
|
||||||
|
if (strcmp(getprogname(), "makekey") == 0)
|
||||||
|
operation = DO_MAKEKEY;
|
||||||
|
|
||||||
|
while ((opt = getopt(argc, argv, "kmpS:s:b:")) != -1) {
|
||||||
|
switch (opt) {
|
||||||
|
case 'k': /* Stdin/Stdout Unix crypt */
|
||||||
|
if (operation != -1 || prompt)
|
||||||
|
usage();
|
||||||
|
operation = DO_MAKEKEY;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'm': /* MD5 password hash */
|
||||||
|
if (operation != -1)
|
||||||
|
usage();
|
||||||
|
operation = DO_MD5;
|
||||||
|
extra = NULL;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'p':
|
||||||
|
if (operation == DO_MAKEKEY)
|
||||||
|
usage();
|
||||||
|
prompt = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'S': /* SHA1 password hash */
|
||||||
|
if (operation != -1)
|
||||||
|
usage();
|
||||||
|
operation = DO_SHA1;
|
||||||
|
extra = optarg;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 's': /* Unix crypt (DES) */
|
||||||
|
if (operation != -1 || optarg[0] == '$')
|
||||||
|
usage();
|
||||||
|
operation = DO_DES;
|
||||||
|
extra = optarg;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'b': /* Blowfish password hash */
|
||||||
|
if (operation != -1)
|
||||||
|
usage();
|
||||||
|
operation = DO_BLF;
|
||||||
|
extra = optarg;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
usage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (((argc - optind) < 1) || operation == DO_MAKEKEY) {
|
||||||
|
char line[LINE_MAX], *string;
|
||||||
|
|
||||||
|
if (prompt) {
|
||||||
|
string = getpass("Enter string: ");
|
||||||
|
print_passwd(string, operation, extra);
|
||||||
|
(void)fputc('\n', stdout);
|
||||||
|
} else {
|
||||||
|
/* Encrypt stdin to stdout. */
|
||||||
|
while (!feof(stdin) &&
|
||||||
|
(fgets(line, sizeof(line), stdin) != NULL)) {
|
||||||
|
/* Kill the whitesapce. */
|
||||||
|
string = trim(line);
|
||||||
|
if (*string == '\0')
|
||||||
|
continue;
|
||||||
|
|
||||||
|
print_passwd(string, operation, extra);
|
||||||
|
|
||||||
|
if (operation == DO_MAKEKEY) {
|
||||||
|
(void)fflush(stdout);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
(void)fputc('\n', stdout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
char *string;
|
||||||
|
|
||||||
|
/* can't combine -p with a supplied string */
|
||||||
|
if (prompt)
|
||||||
|
usage();
|
||||||
|
|
||||||
|
/* Perhaps it isn't worth worrying about, but... */
|
||||||
|
if ((string = strdup(argv[optind])) == NULL)
|
||||||
|
err(1, NULL);
|
||||||
|
/* Wipe the argument. */
|
||||||
|
(void)memset(argv[optind], 0, strlen(argv[optind]));
|
||||||
|
|
||||||
|
print_passwd(string, operation, extra);
|
||||||
|
|
||||||
|
(void)fputc('\n', stdout);
|
||||||
|
|
||||||
|
/* Wipe our copy, before we free it. */
|
||||||
|
(void)memset(string, 0, strlen(string));
|
||||||
|
free(string);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Reference in a new issue