'passwd' tool.
This commit is contained in:
Bodo Möller
parent
0a751d8ce8
commit
bb325c7d6a
3
CHANGES
3
CHANGES
@ -4,6 +4,9 @@
|
||||
|
||||
Changes between 0.9.4 and 0.9.5 [xx XXX 2000]
|
||||
|
||||
*) New 'passwd' tool, currently only -fcrypt is implemented.
|
||||
[Bodo Moeller]
|
||||
|
||||
*) Add command line password options to the remaining applications.
|
||||
[Steve Henson]
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ SCRIPTS=CA.sh CA.pl der_chop
|
||||
|
||||
EXE= $(PROGRAM)
|
||||
|
||||
E_EXE= verify asn1pars req dgst dh dhparam enc gendh errstr \
|
||||
E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
|
||||
ca crl rsa dsa dsaparam \
|
||||
x509 genrsa gendsa s_server s_client speed \
|
||||
s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \
|
||||
@ -49,7 +49,7 @@ S_SRC= s_cb.c s_socket.c
|
||||
RAND_OBJ=app_rand.o
|
||||
RAND_SRC=app_rand.c
|
||||
|
||||
E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o gendh.o errstr.o \
|
||||
E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
|
||||
ca.o pkcs7.o crl2p7.o crl.o \
|
||||
rsa.o dsa.o dsaparam.o \
|
||||
x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
|
||||
@ -58,7 +58,7 @@ E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o gendh.o errstr.o \
|
||||
|
||||
# pem_mail.o
|
||||
|
||||
E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c gendh.c errstr.c ca.c \
|
||||
E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
|
||||
pkcs7.c crl2p7.c crl.c \
|
||||
rsa.c dsa.c dsaparam.c \
|
||||
x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
|
||||
|
||||
192
apps/passwd.c
Normal file
192
apps/passwd.c
Normal file
@ -0,0 +1,192 @@
|
||||
/* apps/passwd.c */
|
||||
|
||||
#if !defined(NO_DES) /* && !defined(prerequisites of other algorithms) */
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "apps.h"
|
||||
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
|
||||
#ifndef NO_DES
|
||||
# include <openssl/des.h>
|
||||
#endif
|
||||
|
||||
#undef PROG
|
||||
#define PROG passwd_main
|
||||
|
||||
|
||||
static unsigned const char cov_2char[64]={
|
||||
/* from crypto/des/fcrypt.c */
|
||||
0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
|
||||
0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
|
||||
0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,
|
||||
0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,
|
||||
0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62,
|
||||
0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,
|
||||
0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,
|
||||
0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A
|
||||
};
|
||||
|
||||
/* -crypt - standard Unix password algorithm (default, only choice)
|
||||
* -salt string - salt
|
||||
* -quiet - no warnings
|
||||
* -table - format output as table
|
||||
*/
|
||||
|
||||
int MAIN(int argc, char **argv)
|
||||
{
|
||||
int ret = 1;
|
||||
char *salt = NULL, *passwd, **passwds = NULL;
|
||||
char *salt_malloc = NULL, *passwd_malloc = NULL;
|
||||
BIO *out = NULL;
|
||||
int i, badopt, opt_done;
|
||||
int passed_salt = 0, quiet = 0, table = 0;
|
||||
int crypt = 0;
|
||||
size_t pw_maxlen = 0;
|
||||
|
||||
apps_startup();
|
||||
|
||||
if (bio_err == NULL)
|
||||
if ((bio_err=BIO_new(BIO_s_file())) != NULL)
|
||||
BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
|
||||
out = BIO_new(BIO_s_file());
|
||||
if (out == NULL)
|
||||
goto err;
|
||||
BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
|
||||
|
||||
badopt = 0, opt_done = 0;
|
||||
i = 0;
|
||||
while (!badopt && !opt_done && argv[++i] != NULL)
|
||||
{
|
||||
if (strcmp(argv[i], "-crypt") == 0)
|
||||
crypt = 1;
|
||||
else if (strcmp(argv[i], "-salt") == 0)
|
||||
{
|
||||
if ((argv[i+1] != NULL) && (salt == NULL))
|
||||
{
|
||||
passed_salt = 1;
|
||||
salt = argv[++i];
|
||||
}
|
||||
else badopt = 1;
|
||||
}
|
||||
else if (strcmp(argv[i], "-quiet") == 0)
|
||||
quiet = 1;
|
||||
else if (strcmp(argv[i], "-table") == 0)
|
||||
table = 1;
|
||||
else if (argv[i][0] == '-')
|
||||
badopt = 1;
|
||||
else
|
||||
/* non-option argument */
|
||||
{
|
||||
passwds = &argv[i];
|
||||
opt_done = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (crypt /* + algo2 + algo3 + ... */ == 0) /* use default */
|
||||
crypt = 1;
|
||||
if (crypt /* + algo2 + algo3 */ > 1) /* conflict */
|
||||
badopt = 1;
|
||||
|
||||
if (badopt)
|
||||
{
|
||||
BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
|
||||
BIO_printf(bio_err, "where options are\n");
|
||||
BIO_printf(bio_err, "-crypt standard Unix password algorithm (default)\n");
|
||||
BIO_printf(bio_err, "-salt string use provided salt\n");
|
||||
BIO_printf(bio_err, "-quiet no warnings\n");
|
||||
BIO_printf(bio_err, "-table format output as table\n");
|
||||
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (crypt)
|
||||
pw_maxlen = 8;
|
||||
/* else if ... */
|
||||
|
||||
if (passwds == NULL)
|
||||
{
|
||||
/* build a null-terminated list */
|
||||
static char *passwds_static[2] = {NULL, NULL};
|
||||
|
||||
passwds = passwds_static;
|
||||
passwd_malloc = Malloc(pw_maxlen + 1);
|
||||
if (passwd_malloc == NULL)
|
||||
goto err;
|
||||
if (EVP_read_pw_string(passwd_malloc, pw_maxlen + 1, "Password: ", 0) != 0)
|
||||
goto err;
|
||||
passwds[0] = passwd_malloc;
|
||||
}
|
||||
|
||||
assert(passwds != NULL);
|
||||
assert(*passwds != NULL);
|
||||
|
||||
do /* loop over list of passwords */
|
||||
{
|
||||
/* first make sure we have a salt */
|
||||
if (!passed_salt)
|
||||
{
|
||||
if (crypt)
|
||||
{
|
||||
if (salt_malloc == NULL)
|
||||
{
|
||||
salt = salt_malloc = Malloc(3);
|
||||
if (salt_malloc == NULL)
|
||||
goto err;
|
||||
}
|
||||
if (RAND_pseudo_bytes((unsigned char *)salt, 2) < 0)
|
||||
goto err;
|
||||
salt[0] = cov_2char[salt[0] & 0x3f]; /* 6 bits */
|
||||
salt[1] = cov_2char[salt[1] & 0x3f]; /* 6 bits */
|
||||
salt[2] = 0;
|
||||
#ifdef CHARSET_EBCDIC
|
||||
ascii2ebcdic(salt, salt, 2); /* des_crypt will convert
|
||||
* back to ASCII */
|
||||
#endif
|
||||
}
|
||||
/* else if (algo2) ... */
|
||||
}
|
||||
|
||||
assert(salt != NULL);
|
||||
|
||||
/* truncate password if necessary */
|
||||
passwd = *passwds++;
|
||||
if ((strlen(passwd) > pw_maxlen))
|
||||
{
|
||||
if (!quiet)
|
||||
BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);
|
||||
passwd[pw_maxlen] = 0;
|
||||
}
|
||||
assert(strlen(passwd) <= pw_maxlen);
|
||||
|
||||
/* now compute password hash */
|
||||
if (crypt)
|
||||
{
|
||||
char *hash = des_crypt(passwd, salt);
|
||||
if (table)
|
||||
BIO_printf(out, "%s\t%s\n", passwd, hash);
|
||||
else
|
||||
BIO_printf(out, "%s\n", hash);
|
||||
}
|
||||
/* else if (algo2) { ... } else if (algo3) { ... } */
|
||||
else
|
||||
assert(0);
|
||||
}
|
||||
while (*passwds != NULL);
|
||||
|
||||
err:
|
||||
ERR_print_errors(bio_err);
|
||||
if (salt_malloc)
|
||||
Free(salt_malloc);
|
||||
if (passwd_malloc)
|
||||
Free(passwd_malloc);
|
||||
if (out)
|
||||
BIO_free(out);
|
||||
EXIT(ret);
|
||||
}
|
||||
#endif
|
||||
@ -8,6 +8,7 @@ extern int dgst_main(int argc,char *argv[]);
|
||||
extern int dh_main(int argc,char *argv[]);
|
||||
extern int dhparam_main(int argc,char *argv[]);
|
||||
extern int enc_main(int argc,char *argv[]);
|
||||
extern int passwd_main(int argc,char *argv[]);
|
||||
extern int gendh_main(int argc,char *argv[]);
|
||||
extern int errstr_main(int argc,char *argv[]);
|
||||
extern int ca_main(int argc,char *argv[]);
|
||||
@ -55,6 +56,7 @@ FUNCTION functions[] = {
|
||||
{FUNC_TYPE_GENERAL,"dhparam",dhparam_main},
|
||||
#endif
|
||||
{FUNC_TYPE_GENERAL,"enc",enc_main},
|
||||
{FUNC_TYPE_GENERAL,"passwd",passwd_main},
|
||||
#ifndef NO_DH
|
||||
{FUNC_TYPE_GENERAL,"gendh",gendh_main},
|
||||
#endif
|
||||
|
||||
50
doc/apps/passwd.pod
Normal file
50
doc/apps/passwd.pod
Normal file
@ -0,0 +1,50 @@
|
||||
=pod
|
||||
|
||||
=head1 NAME
|
||||
|
||||
passwd - compute password hashes
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
B<openssl passwd>
|
||||
[B<-crypt>]
|
||||
[B<-salt string>]
|
||||
[B<-quiet>]
|
||||
[B<-table>]
|
||||
{B<password>}
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
The B<passwd> command computes the hashes of a list of passwords
|
||||
passed on the command line, or the hash of a password typed at run-time.
|
||||
Currently only the Unix standard algorithm B<crypt>
|
||||
is implemented.
|
||||
|
||||
=head1 OPTIONS
|
||||
|
||||
=over 4
|
||||
|
||||
=item B<-crypt>
|
||||
|
||||
Use the B<crypt> algorithm (default).
|
||||
|
||||
=item B<-salt string>
|
||||
|
||||
Use the specified salt.
|
||||
|
||||
=item B<-quiet>
|
||||
|
||||
Don't output warnings when passwords are truncated.
|
||||
|
||||
=item B<-table>
|
||||
|
||||
In the output list, prepend the cleartext password and a TAB character
|
||||
to each password hash.
|
||||
|
||||
=back
|
||||
|
||||
=head1 EXAMPLE
|
||||
|
||||
B<openssl passwd -salt xx password> prints B<xxj31ZMTZzkVA>.
|
||||
|
||||
=cut
|
||||
Loading…
x
Reference in New Issue
Block a user