65c10f6d33
so I am backing it out for now. The problem is that some random program calling crypt() could be passing a DES salt and the crypt(3) library would encrypt it in md5 mode and there would be a password mismatch as a result. I wrote a validater function for the DES code to verify that a salt is valid for DES, but I realized there were too many strange things to go wrong. passwd(1), pw(8) etc still generate md5 passwords by default for /etc/master.passwd, so this is almost academic. It is a big deal for things that have their own crypt(3)-ed password strings (.htaccess, etc etc). Those are the things I do not want to break. My DES salt recognizer basically checked if the salt was either 2 or 13 characters long, or began with '_' (_PASSWORD_EFMT1). I think it would have worked but I have seen way too much crypt() mishandling in the past.
123 lines
2.9 KiB
C
123 lines
2.9 KiB
C
/*
|
|
* Copyright (c) 1999
|
|
* Mark Murray. 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 MARK MURRAY AND CONTRIBUTORS ``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 MARK MURRAY OR CONTRIBUTORS 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.
|
|
*
|
|
* $FreeBSD$
|
|
*
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <string.h>
|
|
#include <libutil.h>
|
|
#include "crypt.h"
|
|
|
|
static const struct {
|
|
const char *const name;
|
|
char *(*const func)(const char *, const char *);
|
|
const char *const magic;
|
|
} crypt_types[] = {
|
|
#ifdef HAS_DES
|
|
{
|
|
"des",
|
|
crypt_des,
|
|
NULL
|
|
},
|
|
#endif
|
|
{
|
|
"md5",
|
|
crypt_md5,
|
|
"$1$"
|
|
},
|
|
{
|
|
NULL,
|
|
NULL
|
|
}
|
|
};
|
|
|
|
static int crypt_type = -1;
|
|
|
|
static void
|
|
crypt_setdefault(void)
|
|
{
|
|
char *def;
|
|
int i;
|
|
|
|
if (crypt_type != -1)
|
|
return;
|
|
def = auth_getval("crypt_default");
|
|
if (def == NULL) {
|
|
crypt_type = 0;
|
|
return;
|
|
}
|
|
for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
|
|
if (strcmp(def, crypt_types[i].name) == 0) {
|
|
crypt_type = i;
|
|
return;
|
|
}
|
|
}
|
|
crypt_type = 0;
|
|
}
|
|
|
|
const char *
|
|
crypt_get_format(void)
|
|
{
|
|
|
|
crypt_setdefault();
|
|
return (crypt_types[crypt_type].name);
|
|
}
|
|
|
|
int
|
|
crypt_set_format(char *type)
|
|
{
|
|
int i;
|
|
|
|
crypt_setdefault();
|
|
for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
|
|
if (strcmp(type, crypt_types[i].name) == 0) {
|
|
crypt_type = i;
|
|
return (1);
|
|
}
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
char *
|
|
crypt(char *passwd, char *salt)
|
|
{
|
|
int i;
|
|
|
|
crypt_setdefault();
|
|
for (i = 0; i < sizeof(crypt_types) / sizeof(crypt_types[0]) - 1; i++) {
|
|
if (crypt_types[i].magic != NULL && strncmp(salt,
|
|
crypt_types[i].magic, strlen(crypt_types[i].magic)) == 0)
|
|
return (crypt_types[i].func(passwd, salt));
|
|
}
|
|
return (crypt_types[crypt_type].func(passwd, salt));
|
|
}
|