Zap SHA1 password support. This will be re-implemented at a later date.
This commit is contained in:
kris
parent
60cca837b4
commit
b07ed057b5
@ -16,8 +16,8 @@ SONAME= ${LCRYPTSO}
|
||||
.endif
|
||||
|
||||
.PATH: ${.CURDIR}/../libmd
|
||||
SRCS= crypt.c crypt-md5.c crypt-shs.c misc.c
|
||||
STATICSRCS= md5c.c sha0c.c sha1c.c
|
||||
SRCS= crypt.c crypt-md5.c misc.c
|
||||
STATICSRCS= md5c.c
|
||||
STATICOBJS= ${STATICSRCS:S/.c/.o/g}
|
||||
MAN3= crypt.3
|
||||
CFLAGS+= -I${.CURDIR}/../libmd
|
||||
|
||||
@ -1,190 +0,0 @@
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* "THE BEER-WARE LICENSE" (Revision 42):
|
||||
* <phk@login.dknet.dk> wrote this file. As long as you retain this notice you
|
||||
* can do whatever you want with this stuff. If we meet some day, and you think
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $FreeBSD$
|
||||
*
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = \
|
||||
"$FreeBSD$";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sha.h>
|
||||
#include <err.h>
|
||||
#include "crypt.h"
|
||||
|
||||
#ifdef __PIC__
|
||||
#include <dlfcn.h>
|
||||
|
||||
#define SHA_Init(ctx) dl_SHA_Init(ctx)
|
||||
#define SHA_Update(ctx, data, len) dl_SHA_Update(ctx, data, len)
|
||||
#define SHA_Final(dgst, ctx) dl_SHA_Final(dgst, ctx)
|
||||
|
||||
static void (*dl_SHA_Init)(SHA_CTX *);
|
||||
static void (*dl_SHA_Update)(SHA_CTX *, const unsigned char *, unsigned int);
|
||||
static void (*dl_SHA_Final)(unsigned char digest[20], SHA_CTX *);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* UNIX password
|
||||
*/
|
||||
|
||||
char *
|
||||
crypt_sha(pw, salt)
|
||||
const char *pw;
|
||||
const char *salt;
|
||||
{
|
||||
static char *magic = "$3$"; /*
|
||||
* This string is magic for
|
||||
* this algorithm. Having
|
||||
* it this way, we can get
|
||||
* get better later on
|
||||
*/
|
||||
static char passwd[120], *p;
|
||||
static const char *sp,*ep;
|
||||
unsigned char final[SHS_SIZE];
|
||||
int sl,pl,i;
|
||||
SHA_CTX ctx,ctx1;
|
||||
unsigned long l;
|
||||
#ifdef __PIC__
|
||||
void *libmd;
|
||||
#endif
|
||||
|
||||
/* Refine the Salt first */
|
||||
sp = salt;
|
||||
|
||||
/* If it starts with the magic string, then skip that */
|
||||
if(!strncmp(sp,magic,strlen(magic)))
|
||||
sp += strlen(magic);
|
||||
|
||||
/* It stops at the first '$', max 8 chars */
|
||||
for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
|
||||
continue;
|
||||
|
||||
/* get the length of the true salt */
|
||||
sl = ep - sp;
|
||||
|
||||
#ifdef __PIC__
|
||||
libmd = dlopen("libmd.so", RTLD_NOW);
|
||||
if (libmd == NULL) {
|
||||
warnx("libcrypt-md5: dlopen(libmd.so): %s\n", dlerror());
|
||||
return NULL;
|
||||
}
|
||||
dl_SHA_Init = dlsym(libmd, "SHA_Init");
|
||||
if (dl_SHA_Init == NULL) {
|
||||
warnx("libcrypt-md5: looking for SHA_Init: %s\n", dlerror());
|
||||
dlclose(libmd);
|
||||
return NULL;
|
||||
}
|
||||
dl_SHA_Update = dlsym(libmd, "SHA_Update");
|
||||
if (dl_SHA_Update == NULL) {
|
||||
warnx("libcrypt-md5: looking for SHA_Update: %s\n", dlerror());
|
||||
dlclose(libmd);
|
||||
return NULL;
|
||||
}
|
||||
dl_SHA_Final = dlsym(libmd, "SHA_Final");
|
||||
if (dl_SHA_Final == NULL) {
|
||||
warnx("libcrypt-md5: looking for SHA_Final: %s\n", dlerror());
|
||||
dlclose(libmd);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
SHA_Init(&ctx);
|
||||
|
||||
/* The password first, since that is what is most unknown */
|
||||
SHA_Update(&ctx,pw,strlen(pw));
|
||||
|
||||
/* Then our magic string */
|
||||
SHA_Update(&ctx,magic,strlen(magic));
|
||||
|
||||
/* Then the raw salt */
|
||||
SHA_Update(&ctx,sp,sl);
|
||||
|
||||
/* Then just as many characters of the SHA(pw,salt,pw) */
|
||||
SHA_Init(&ctx1);
|
||||
SHA_Update(&ctx1,pw,strlen(pw));
|
||||
SHA_Update(&ctx1,sp,sl);
|
||||
SHA_Update(&ctx1,pw,strlen(pw));
|
||||
SHA_Final(final,&ctx1);
|
||||
for(pl = strlen(pw); pl > 0; pl -= SHS_SIZE)
|
||||
SHA_Update(&ctx,final,pl>SHS_SIZE ? SHS_SIZE : pl);
|
||||
|
||||
/* Don't leave anything around in vm they could use. */
|
||||
memset(final,0,sizeof final);
|
||||
|
||||
/* Then something really weird... */
|
||||
for (i = strlen(pw); i ; i >>= 1)
|
||||
if(i&1)
|
||||
SHA_Update(&ctx, final, 1);
|
||||
else
|
||||
SHA_Update(&ctx, pw, 1);
|
||||
|
||||
/* Now make the output string */
|
||||
strcpy(passwd,magic);
|
||||
strncat(passwd,sp,sl);
|
||||
strcat(passwd,"$");
|
||||
|
||||
SHA_Final(final,&ctx);
|
||||
|
||||
/*
|
||||
* and now, just to make sure things don't run too fast
|
||||
* On a 60 Mhz Pentium this takes 34 msec, so you would
|
||||
* need 30 seconds to build a 1000 entry dictionary...
|
||||
*/
|
||||
for(i=0;i<1000;i++) {
|
||||
SHA_Init(&ctx1);
|
||||
if(i & 1)
|
||||
SHA_Update(&ctx1,pw,strlen(pw));
|
||||
else
|
||||
SHA_Update(&ctx1,final,SHS_SIZE);
|
||||
|
||||
if(i % 3)
|
||||
SHA_Update(&ctx1,sp,sl);
|
||||
|
||||
if(i % 7)
|
||||
SHA_Update(&ctx1,pw,strlen(pw));
|
||||
|
||||
if(i & 1)
|
||||
SHA_Update(&ctx1,final,SHS_SIZE);
|
||||
else
|
||||
SHA_Update(&ctx1,pw,strlen(pw));
|
||||
SHA_Final(final,&ctx1);
|
||||
}
|
||||
|
||||
#ifdef __PIC__
|
||||
dlclose(libmd);
|
||||
#endif
|
||||
p = passwd + strlen(passwd);
|
||||
|
||||
l = (final[ 0]<<16) | (final[ 6]<<8) | final[12];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[ 1]<<16) | (final[ 7]<<8) | final[13];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[ 2]<<16) | (final[ 8]<<8) | final[14];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[ 3]<<16) | (final[ 9]<<8) | final[15];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[ 4]<<16) | (final[10]<<8) | final[16];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[ 5]<<16) | (final[11]<<8) | final[17];
|
||||
_crypt_to64(p,l,4); p += 4;
|
||||
l = (final[18]<<8) | final[19];
|
||||
_crypt_to64(p,l,3); p += 3;
|
||||
|
||||
*p = '\0';
|
||||
|
||||
/* Don't leave anything around in vm they could use. */
|
||||
memset(final,0,sizeof final);
|
||||
|
||||
return passwd;
|
||||
}
|
||||
|
||||
@ -39,8 +39,6 @@ crypt(char *passwd, char *salt)
|
||||
{
|
||||
if (!strncmp(salt, "$1$", 3))
|
||||
return crypt_md5(passwd, salt);
|
||||
if (!strncmp(salt, "$3$", 3))
|
||||
return crypt_sha(passwd, salt);
|
||||
#ifdef NONEXPORTABLE_CRYPT
|
||||
return crypt_des(passwd, salt);
|
||||
#else
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
|
||||
char *crypt_des(const char *pw, const char *salt);
|
||||
char *crypt_md5(const char *pw, const char *salt);
|
||||
char *crypt_sha(const char *pw, const char *salt);
|
||||
|
||||
extern void _crypt_to64(char *s, unsigned long v, int n);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user