d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/shaN_crypt/crypt_shaN/g to be a more consistent with the existing naming.

Browse Source 
Reviewed by:	markm
This commit is contained in:
David E. O'Brien 2011-05-05 01:09:42 +00:00
parent ebd3486c2a
commit ad45dd4174
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=221471
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libcrypt/crypt-sha256.c
View File

@ -60,7 +60,7 @@ static const char sha256_rounds_prefix[] = "rounds=";
#define ROUNDS_MAX 999999999
static char *
sha256_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
crypt_sha256_r(const char *key, const char *salt, char *buffer, int buflen)
{
u_long srounds;
int n;
@ -268,12 +268,12 @@ sha256_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
/* This entry point is equivalent to crypt(3). */
char *
sha256_crypt(const char *key, const char *salt)
crypt_sha256(const char *key, const char *salt)
{
/* We don't want to have an arbitrary limit in the size of the
* password. We can compute an upper bound for the size of the
* result in advance and so we can prepare the buffer we pass to
* `sha256_crypt_r'. */
* `crypt_sha256_r'. */
static char *buffer;
static int buflen;
int needed;
@ -293,7 +293,7 @@ sha256_crypt(const char *key, const char *salt)
buflen = needed;
}
return sha256_crypt_r(key, salt, buffer, buflen);
return crypt_sha256_r(key, salt, buffer, buflen);
}
#ifdef TEST
@ -459,7 +459,7 @@ main(void)
}
for (cnt = 0; cnt < ntests2; ++cnt) {
char *cp = sha256_crypt(tests2[cnt].input, tests2[cnt].salt);
char *cp = crypt_sha256(tests2[cnt].input, tests2[cnt].salt);
if (strcmp(cp, tests2[cnt].expected) != 0) {
printf("test %d: expected \"%s\", got \"%s\"\n",

10
lib/libcrypt/crypt-sha512.c
View File

@ -60,7 +60,7 @@ static const char sha512_rounds_prefix[] = "rounds=";
#define ROUNDS_MAX 999999999
static char *
sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
crypt_sha512_r(const char *key, const char *salt, char *buffer, int buflen)
{
u_long srounds;
int n;
@ -280,12 +280,12 @@ sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
/* This entry point is equivalent to crypt(3). */
char *
sha512_crypt(const char *key, const char *salt)
crypt_sha512(const char *key, const char *salt)
{
/* We don't want to have an arbitrary limit in the size of the
* password. We can compute an upper bound for the size of the
* result in advance and so we can prepare the buffer we pass to
* `sha512_crypt_r'. */
* `crypt_sha512_r'. */
static char *buffer;
static int buflen;
int needed;
@ -305,7 +305,7 @@ sha512_crypt(const char *key, const char *salt)
buflen = needed;
}
return sha512_crypt_r(key, salt, buffer, buflen);
return crypt_sha512_r(key, salt, buffer, buflen);
}
#ifdef TEST
@ -482,7 +482,7 @@ main(void)
}
for (cnt = 0; cnt < ntests2; ++cnt) {
char *cp = sha512_crypt(tests2[cnt].input, tests2[cnt].salt);
char *cp = crypt_sha512(tests2[cnt].input, tests2[cnt].salt);
if (strcmp(cp, tests2[cnt].expected) != 0) {
printf("test %d: expected \"%s\", got \"%s\"\n",

4
lib/libcrypt/crypt.c
View File

@ -64,12 +64,12 @@ static const struct {
},
{
"sha256",
sha256_crypt,
crypt_sha256,
"$5$"
},
{
"sha512",
sha512_crypt,
crypt_sha512,
"$6$"
},
{

4
lib/libcrypt/crypt.h
View File

@ -36,8 +36,8 @@ char *crypt_des(const char *pw, const char *salt);
char *crypt_md5(const char *pw, const char *salt);
char *crypt_nthash(const char *pw, const char *salt);
char *crypt_blowfish(const char *pw, const char *salt);
char *sha256_crypt (const char *pw, const char *salt);
char *sha512_crypt (const char *pw, const char *salt);
char *crypt_sha256 (const char *pw, const char *salt);
char *crypt_sha512 (const char *pw, const char *salt);
extern void _crypt_to64(char *s, u_long v, int n);
extern void b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, int *buflen, char **cp);