9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Import new mkpasswd from ircd-ratbox.

Browse source 
This now uses libratbox.
This commit is contained in:
Jilles Tjoelker 2009-02-22 00:59:16 +01:00
parent 4a584d412e
commit f1d07f6b7c
2 changed files with 441 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/Makefile.in
View file

@ -15,13 +15,14 @@ MV = @MV@
RM = @RM@ RM = @RM@
LN = @LN@ LN = @LN@
IRCDLIBS = @LIBS@ IRCDLIBS = -L../libratbox/src/.libs -lratbox @LIBS@
INCLUDES = -I../include INCLUDES = -I../include -I../libratbox/include
CPPFLAGS = ${INCLUDES} @CPPFLAGS@ CPPFLAGS = ${INCLUDES} @CPPFLAGS@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
confdir = @confdir@ confdir = @confdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@

710
tools/mkpasswd.c
View file

@ -9,7 +9,7 @@
** /dev/random for salt generation added by ** /dev/random for salt generation added by
** Aaron Sethman <androsyn@ratbox.org> ** Aaron Sethman <androsyn@ratbox.org>
** **
** $Id: mkpasswd.c 6 2005-09-10 01:02:21Z nenolod $ ** $Id: mkpasswd.c 26439 2009-02-01 15:27:24Z jilles $
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -17,24 +17,32 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include "ratbox_lib.h"
#ifndef __MINGW32__
#include <pwd.h>
#endif
#define FLAG_MD5 0x00000001 #define FLAG_MD5 0x00000001
#define FLAG_DES 0x00000002 #define FLAG_DES 0x00000002
#define FLAG_SALT 0x00000004 #define FLAG_SALT 0x00000004
#define FLAG_PASS 0x00000008 #define FLAG_PASS 0x00000008
#define FLAG_LENGTH 0x00000010 #define FLAG_LENGTH 0x00000010
#define FLAG_BLOWFISH 0x00000020 #define FLAG_BLOWFISH 0x00000020
#define FLAG_ROUNDS 0x00000040 #define FLAG_ROUNDS 0x00000040
#define FLAG_EXT 0x00000080 #define FLAG_EXT 0x00000080
#define FLAG_SHA256 0x00000100
#define FLAG_SHA512 0x00000200
extern char *getpass();
extern char *crypt();
static char *make_des_salt(void); static char *make_des_salt(void);
static char *make_ext_salt(int); static char *make_ext_salt(int);
static char *make_ext_salt_para(int, char *); static char *make_ext_salt_para(int, char *);
static char *make_md5_salt(int); static char *make_md5_salt(int);
static char *make_md5_salt_para(char *); static char *make_md5_salt_para(char *);
static char *make_sha256_salt(int);
static char *make_sha256_salt_para(char *);
static char *make_sha512_salt(int);
static char *make_sha512_salt_para(char *);
static char *make_bf_salt(int, int); static char *make_bf_salt(int, int);
static char *make_bf_salt_para(int, char *); static char *make_bf_salt_para(int, char *);
static char *int_to_base64(int); static char *int_to_base64(int);
@ -44,321 +52,471 @@ static char *generate_poor_salt(char *, int);
static void full_usage(void); static void full_usage(void);
static void brief_usage(void); static void brief_usage(void);
static char saltChars[] = static char saltChars[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
/* 0 .. 63, ascii - 64 */ /* 0 .. 63, ascii - 64 */
extern char *optarg; extern char *optarg;
int main(int argc, char *argv[])
#ifdef __MINGW32__
#include <conio.h>
#ifdef PASS_MAX
#undef PASS_MAX
#endif
#define PASS_MAX 256
static char getpassbuf[PASS_MAX + 1];
static char *
getpass(const char *prompt)
{ {
char *plaintext = NULL; int c;
int c; int i = 0;
char *saltpara = NULL;
char *salt;
int flag = 0;
int length = 0; /* Not Set */
int rounds = 0; /* Not set, since extended DES needs 25 and blowfish needs
** 4 by default, a side effect of this being the encryption
** type parameter must be specified before the rounds
** parameter.
*/
while( (c=getopt(argc, argv, "mdber:h?l:s:p:")) != -1) memset(getpassbuf, sizeof(getpassbuf), 0);
{ fputs(prompt, stderr);
switch(c) for(;;)
{ {
case 'm': c = _getch();
flag |= FLAG_MD5; if(c == '\r')
break; {
case 'd': getpassbuf[i] = '\0';
flag |= FLAG_DES; break;
break; }
case 'b': else if(i < PASS_MAX)
flag |= FLAG_BLOWFISH; {
rounds = 4; getpassbuf[i++] = c;
break; }
case 'e': }
flag |= FLAG_EXT; fputs("\r\n", stderr);
rounds = 25;
break;
case 'l':
flag |= FLAG_LENGTH;
length = atoi(optarg);
break;
case 'r':
flag |= FLAG_ROUNDS;
rounds = atoi(optarg);
break;
case 's':
flag |= FLAG_SALT;
saltpara = optarg;
break;
case 'p':
flag |= FLAG_PASS;
plaintext = optarg;
break;
case 'h':
full_usage();
/* NOT REACHED */
break;
case '?':
brief_usage();
/* NOT REACHED */
break;
default:
printf("Invalid Option: -%c\n", c);
break;
}
}
if (flag & FLAG_MD5) return getpassbuf;
{ }
if (length == 0) #endif
length = 8;
if (flag & FLAG_SALT)
salt = make_md5_salt_para(saltpara);
else
salt = make_md5_salt(length);
}
else if (flag & FLAG_BLOWFISH)
{
if (length == 0)
length = 22;
if (flag & FLAG_SALT)
salt = make_bf_salt_para(rounds, saltpara);
else
salt = make_bf_salt(rounds, length);
}
else if (flag & FLAG_EXT)
{
/* XXX - rounds needs to be done */
if (flag & FLAG_SALT)
{
if ((strlen(saltpara) == 4))
{
salt = make_ext_salt_para(rounds, saltpara);
}
else
{
printf("Invalid salt, please enter 4 alphanumeric characters\n");
exit(1);
}
}
else
{
salt = make_ext_salt(rounds);
}
}
else
{
if (flag & FLAG_SALT)
{
if ((strlen(saltpara) == 2))
{
salt = saltpara;
}
else
{
printf("Invalid salt, please enter 2 alphanumeric characters\n");
exit(1);
}
}
else
{
salt = make_des_salt();
}
}
if (flag & FLAG_PASS)
{
if (!plaintext)
printf("Please enter a valid password\n");
}
else
{
plaintext = getpass("plaintext: ");
}
printf("%s\n", crypt(plaintext, salt)); int
return 0; main(int argc, char *argv[])
{
char *plaintext = NULL;
int c;
char *saltpara = NULL;
char *salt;
int flag = 0;
int length = 0; /* Not Set */
int rounds = 0; /* Not set, since extended DES needs 25 and blowfish needs
** 4 by default, a side effect of this being the encryption
** type parameter must be specified before the rounds
** parameter.
*/
while((c = getopt(argc, argv, "xymdber:h?l:s:p:")) != -1)
{
switch (c)
{
case 'm':
flag |= FLAG_MD5;
break;
case 'd':
flag |= FLAG_DES;
break;
case 'b':
flag |= FLAG_BLOWFISH;
rounds = 4;
break;
case 'e':
flag |= FLAG_EXT;
rounds = 25;
break;
case 'l':
flag |= FLAG_LENGTH;
length = atoi(optarg);
break;
case 'r':
flag |= FLAG_ROUNDS;
rounds = atoi(optarg);
break;
case 's':
flag |= FLAG_SALT;
saltpara = optarg;
break;
case 'p':
flag |= FLAG_PASS;
plaintext = optarg;
break;
case 'x':
flag |= FLAG_SHA256;
break;
case 'y':
flag |= FLAG_SHA512;
break;
case 'h':
full_usage();
/* NOT REACHED */
break;
case '?':
brief_usage();
/* NOT REACHED */
break;
default:
printf("Invalid Option: -%c\n", c);
break;
}
}
if(flag & FLAG_MD5)
{
if(length == 0)
length = 8;
if(flag & FLAG_SALT)
salt = make_md5_salt_para(saltpara);
else
salt = make_md5_salt(length);
}
else if(flag & FLAG_BLOWFISH)
{
if(length == 0)
length = 22;
if(flag & FLAG_SALT)
salt = make_bf_salt_para(rounds, saltpara);
else
salt = make_bf_salt(rounds, length);
}
else if(flag & FLAG_SHA256)
{
if(length == 0)
length = 16;
if(flag & FLAG_SALT)
salt = make_sha256_salt_para(saltpara);
else
salt = make_sha256_salt(length);
}
else if(flag & FLAG_SHA512)
{
if(length == 0)
length = 16;
if(flag & FLAG_SALT)
salt = make_sha512_salt_para(saltpara);
else
salt = make_sha512_salt(length);
}
else if(flag & FLAG_EXT)
{
/* XXX - rounds needs to be done */
if(flag & FLAG_SALT)
{
if((strlen(saltpara) == 4))
{
salt = make_ext_salt_para(rounds, saltpara);
}
else
{
printf("Invalid salt, please enter 4 alphanumeric characters\n");
exit(1);
}
}
else
{
salt = make_ext_salt(rounds);
}
}
else
{
if(flag & FLAG_SALT)
{
if((strlen(saltpara) == 2))
{
salt = saltpara;
}
else
{
printf("Invalid salt, please enter 2 alphanumeric characters\n");
exit(1);
}
}
else
{
salt = make_des_salt();
}
}
if(flag & FLAG_PASS)
{
if(!plaintext)
printf("Please enter a valid password\n");
}
else
{
plaintext = getpass("plaintext: ");
}
printf("%s\n", rb_crypt(plaintext, salt));
return 0;
} }
static char *make_des_salt() static char *
make_des_salt()
{ {
static char salt[3]; static char salt[3];
generate_random_salt(salt, 2); generate_random_salt(salt, 2);
salt[2] = '\0'; salt[2] = '\0';
return salt; return salt;
} }
char *int_to_base64(int value) char *
int_to_base64(int value)
{ {
static char buf[5]; static char buf[5];
int i; int i;
for (i = 0; i < 4; i++) for(i = 0; i < 4; i++)
{ {
buf[i] = saltChars[value & 63]; buf[i] = saltChars[value & 63];
value >>= 6; /* Right shifting 6 places is the same as dividing by 64 */ value >>= 6; /* Right shifting 6 places is the same as dividing by 64 */
} }
buf[i] = '\0'; /* not REALLY needed as it's static, and thus initialized buf[i] = '\0'; /* not REALLY needed as it's static, and thus initialized
** to \0. ** to \0.
*/ */
return buf; return buf;
} }
char *make_ext_salt(int rounds) char *
make_ext_salt(int rounds)
{ {
static char salt[10]; static char salt[10];
sprintf(salt, "_%s", int_to_base64(rounds)); sprintf(salt, "_%s", int_to_base64(rounds));
generate_random_salt(&salt[5], 4); generate_random_salt(&salt[5], 4);
salt[9] = '\0'; salt[9] = '\0';
return salt; return salt;
} }
char *make_ext_salt_para(int rounds, char *saltpara) char *
make_ext_salt_para(int rounds, char *saltpara)
{ {
static char salt[10]; static char salt[10];
sprintf(salt, "_%s%s", int_to_base64(rounds), saltpara); sprintf(salt, "_%s%s", int_to_base64(rounds), saltpara);
return salt; return salt;
} }
char *make_md5_salt_para(char *saltpara) char *
make_md5_salt_para(char *saltpara)
{ {
static char salt[21]; static char salt[21];
if (saltpara && (strlen(saltpara) <= 16)) if(saltpara && (strlen(saltpara) <= 16))
{ {
/* sprintf used because of portability requirements, the length /* sprintf used because of portability requirements, the length
** is checked above, so it should not be too much of a concern ** is checked above, so it should not be too much of a concern
*/ */
sprintf(salt, "$1$%s$", saltpara); sprintf(salt, "$1$%s$", saltpara);
return salt; return salt;
} }
printf("Invalid Salt, please use up to 16 random alphanumeric characters\n"); printf("Invalid Salt, please use up to 16 random alphanumeric characters\n");
exit(1); exit(1);
/* NOT REACHED */ /* NOT REACHED */
return NULL; return NULL;
} }
char *make_md5_salt(int length) char *
make_md5_salt(int length)
{ {
static char salt[21]; static char salt[21];
if (length > 16) if(length > 16)
{ {
printf("MD5 salt length too long\n"); printf("MD5 salt length too long\n");
exit(0); exit(0);
} }
salt[0] = '$'; salt[0] = '$';
salt[1] = '1'; salt[1] = '1';
salt[2] = '$'; salt[2] = '$';
generate_random_salt(&salt[3], length); generate_random_salt(&salt[3], length);
salt[length+3] = '$'; salt[length + 3] = '$';
salt[length+4] = '\0'; salt[length + 4] = '\0';
return salt; return salt;
} }
char *make_bf_salt_para(int rounds, char *saltpara) char *
make_sha256_salt_para(char *saltpara)
{ {
static char salt[31]; static char salt[21];
char tbuf[3]; if(saltpara && (strlen(saltpara) <= 16))
if (saltpara && (strlen(saltpara) <= 22)) {
{ /* sprintf used because of portability requirements, the length
/* sprintf used because of portability requirements, the length ** is checked above, so it should not be too much of a concern
** is checked above, so it should not be too much of a concern */
*/ sprintf(salt, "$5$%s$", saltpara);
sprintf(tbuf, "%02d", rounds); return salt;
sprintf(salt, "$2a$%s$%s$", tbuf, saltpara); }
return salt; printf("Invalid Salt, please use up to 16 random alphanumeric characters\n");
} exit(1);
printf("Invalid Salt, please use up to 22 random alphanumeric characters\n");
exit(1);
/* NOT REACHED */ /* NOT REACHED */
return NULL; return NULL;
} }
char *make_bf_salt(int rounds, int length) char *
make_sha512_salt_para(char *saltpara)
{ {
static char salt[31]; static char salt[21];
char tbuf[3]; if(saltpara && (strlen(saltpara) <= 16))
if (length > 22) {
{ /* sprintf used because of portability requirements, the length
printf("BlowFish salt length too long\n"); ** is checked above, so it should not be too much of a concern
exit(0); */
} sprintf(salt, "$6$%s$", saltpara);
sprintf(tbuf, "%02d", rounds); return salt;
sprintf(salt, "$2a$%s$", tbuf); }
generate_random_salt(&salt[7], length); printf("Invalid Salt, please use up to 16 random alphanumeric characters\n");
salt[length+7] = '$'; exit(1);
salt[length+8] = '\0';
return salt; /* NOT REACHED */
return NULL;
} }
char *generate_poor_salt(char *salt, int length)
char *
make_sha256_salt(int length)
{ {
int i; static char salt[21];
srandom(time(NULL)); if(length > 16)
for(i = 0; i < length; i++) {
{ printf("SHA256 salt length too long\n");
salt[i] = saltChars[random() % 64]; exit(0);
} }
return(salt); salt[0] = '$';
salt[1] = '5';
salt[2] = '$';
generate_random_salt(&salt[3], length);
salt[length + 3] = '$';
salt[length + 4] = '\0';
return salt;
} }
char *generate_random_salt(char *salt, int length) char *
make_sha512_salt(int length)
{ {
char *buf; static char salt[21];
int fd, i; if(length > 16)
if((fd = open("/dev/random", O_RDONLY)) < 0) {
{ printf("SHA512 salt length too long\n");
return(generate_poor_salt(salt, length)); exit(0);
} }
buf = calloc(1, length); salt[0] = '$';
if(read(fd, buf, length) != length) salt[1] = '6';
{ salt[2] = '$';
free(buf); generate_random_salt(&salt[3], length);
return(generate_poor_salt(salt, length)); salt[length + 3] = '$';
} salt[length + 4] = '\0';
return salt;
for(i = 0; i < length; i++)
{
salt[i] = saltChars[abs(buf[i]) % 64];
}
free(buf);
return(salt);
} }
void full_usage() char *
make_bf_salt_para(int rounds, char *saltpara)
{ {
printf("mkpasswd [-m|-d|-b|-e] [-l saltlength] [-r rounds] [-s salt] [-p plaintext]\n"); static char salt[31];
printf("-m Generate an MD5 password\n"); char tbuf[3];
printf("-d Generate a DES password\n"); if(saltpara && (strlen(saltpara) <= 22))
printf("-b Generate a BlowFish password\n"); {
printf("-e Generate an Extended DES password\n"); /* sprintf used because of portability requirements, the length
printf("-l Specify a length for a random MD5 or BlowFish salt\n"); ** is checked above, so it should not be too much of a concern
printf("-r Specify a number of rounds for a BlowFish or Extended DES password\n"); */
printf(" BlowFish: default 4, no more than 6 recommended\n"); sprintf(tbuf, "%02d", rounds);
printf(" Extended DES: default 25\n"); sprintf(salt, "$2a$%s$%s$", tbuf, saltpara);
printf("-s Specify a salt, 2 alphanumeric characters for DES, up to 16 for MD5,\n"); return salt;
printf(" up to 22 for BlowFish, and 4 for Extended DES\n"); }
printf("-p Specify a plaintext password to use\n"); printf("Invalid Salt, please use up to 22 random alphanumeric characters\n");
printf("Example: mkpasswd -m -s 3dr -p test\n"); exit(1);
exit(0);
/* NOT REACHED */
return NULL;
} }
void brief_usage() char *
make_bf_salt(int rounds, int length)
{ {
printf("mkpasswd - password hash generator\n"); static char salt[31];
printf("Standard DES: mkpasswd [-d] [-s salt] [-p plaintext]\n"); char tbuf[3];
printf("Extended DES: mkpasswd -e [-r rounds] [-s salt] [-p plaintext]\n"); if(length > 22)
printf(" MD5: mkpasswd -m [-l saltlength] [-s salt] [-p plaintext]\n"); {
printf(" BlowFish: mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n"); printf("BlowFish salt length too long\n");
printf(" [-p plaintext]\n"); exit(0);
printf("Use -h for full usage\n"); }
exit(0); sprintf(tbuf, "%02d", rounds);
sprintf(salt, "$2a$%s$", tbuf);
generate_random_salt(&salt[7], length);
salt[length + 7] = '$';
salt[length + 8] = '\0';
return salt;
}
char *
generate_poor_salt(char *salt, int length)
{
int i;
srand(time(NULL));
for(i = 0; i < length; i++)
{
salt[i] = saltChars[rand() % 64];
}
return (salt);
}
char *
generate_random_salt(char *salt, int length)
{
char *buf;
int fd, i;
if((fd = open("/dev/random", O_RDONLY)) < 0)
{
return (generate_poor_salt(salt, length));
}
buf = calloc(1, length);
if(read(fd, buf, length) != length)
{
free(buf);
return (generate_poor_salt(salt, length));
}
for(i = 0; i < length; i++)
{
salt[i] = saltChars[abs(buf[i]) % 64];
}
free(buf);
return (salt);
}
void
full_usage()
{
printf("mkpasswd [-m|-d|-b|-e] [-l saltlength] [-r rounds] [-s salt] [-p plaintext]\n");
printf("-x Generate a SHA256 password\n");
printf("-y Generate a SHA512 password\n");
printf("-m Generate an MD5 password\n");
printf("-d Generate a DES password\n");
printf("-b Generate a BlowFish password\n");
printf("-e Generate an Extended DES password\n");
printf("-l Specify a length for a random MD5 or BlowFish salt\n");
printf("-r Specify a number of rounds for a BlowFish or Extended DES password\n");
printf(" BlowFish: default 4, no more than 6 recommended\n");
printf(" Extended DES: default 25\n");
printf("-s Specify a salt, 2 alphanumeric characters for DES, up to 16 for MD5,\n");
printf(" up to 22 for BlowFish, and 4 for Extended DES\n");
printf("-p Specify a plaintext password to use\n");
printf("Example: mkpasswd -m -s 3dr -p test\n");
exit(0);
}
void
brief_usage()
{
printf("mkpasswd - password hash generator\n");
printf("Standard DES: mkpasswd [-d] [-s salt] [-p plaintext]\n");
printf("Extended DES: mkpasswd -e [-r rounds] [-s salt] [-p plaintext]\n");
printf(" MD5: mkpasswd -m [-l saltlength] [-s salt] [-p plaintext]\n");
printf(" BlowFish: mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n");
printf(" [-p plaintext]\n");
printf("Use -h for full usage\n");
exit(0);
} }