2007-09-19 20:35:36 +00:00
|
|
|
/* One way encryption based on SHA256 sum.
|
2018-01-01 00:32:25 +00:00
|
|
|
Copyright (C) 2007-2018 Free Software Foundation, Inc.
|
2007-09-19 20:35:36 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2013-05-01 15:46:34 +00:00
|
|
|
#include <stdint.h>
|
2007-09-19 20:35:36 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
#include "sha256.h"
|
2014-06-03 11:09:08 +00:00
|
|
|
#include "crypt-private.h"
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
typedef int PRBool;
|
|
|
|
# include <hasht.h>
|
|
|
|
# include <nsslowhash.h>
|
|
|
|
|
|
|
|
# define sha256_init_ctx(ctxp, nss_ctxp) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (((nss_ctxp = NSSLOWHASH_NewContext (nss_ictx, HASH_AlgSHA256)) \
|
|
|
|
== NULL)) \
|
|
|
|
{ \
|
|
|
|
if (nss_ctx != NULL) \
|
|
|
|
NSSLOWHASH_Destroy (nss_ctx); \
|
|
|
|
if (nss_alt_ctx != NULL) \
|
|
|
|
NSSLOWHASH_Destroy (nss_alt_ctx); \
|
|
|
|
return NULL; \
|
|
|
|
} \
|
|
|
|
NSSLOWHASH_Begin (nss_ctxp); \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
# define sha256_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
|
|
NSSLOWHASH_Update (nss_ctxp, (const unsigned char *) buf, len)
|
|
|
|
|
|
|
|
# define sha256_finish_ctx(ctxp, nss_ctxp, result) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
unsigned int ret; \
|
|
|
|
NSSLOWHASH_End (nss_ctxp, result, &ret, sizeof (result)); \
|
|
|
|
assert (ret == sizeof (result)); \
|
|
|
|
NSSLOWHASH_Destroy (nss_ctxp); \
|
|
|
|
nss_ctxp = NULL; \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
#else
|
|
|
|
# define sha256_init_ctx(ctxp, nss_ctxp) \
|
|
|
|
__sha256_init_ctx (ctxp)
|
|
|
|
|
|
|
|
# define sha256_process_bytes(buf, len, ctxp, nss_ctxp) \
|
|
|
|
__sha256_process_bytes(buf, len, ctxp)
|
|
|
|
|
|
|
|
# define sha256_finish_ctx(ctxp, nss_ctxp, result) \
|
|
|
|
__sha256_finish_ctx (ctxp, result)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2007-09-19 20:35:36 +00:00
|
|
|
/* Define our magic string to mark salt for SHA256 "encryption"
|
|
|
|
replacement. */
|
|
|
|
static const char sha256_salt_prefix[] = "$5$";
|
|
|
|
|
|
|
|
/* Prefix for optional rounds specification. */
|
|
|
|
static const char sha256_rounds_prefix[] = "rounds=";
|
|
|
|
|
|
|
|
/* Maximum salt string length. */
|
|
|
|
#define SALT_LEN_MAX 16
|
|
|
|
/* Default number of rounds if not explicitly specified. */
|
|
|
|
#define ROUNDS_DEFAULT 5000
|
|
|
|
/* Minimum number of rounds. */
|
|
|
|
#define ROUNDS_MIN 1000
|
|
|
|
/* Maximum number of rounds. */
|
|
|
|
#define ROUNDS_MAX 999999999
|
|
|
|
|
|
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
|
|
extern char *__sha256_crypt_r (const char *key, const char *salt,
|
|
|
|
char *buffer, int buflen);
|
|
|
|
extern char *__sha256_crypt (const char *key, const char *salt);
|
|
|
|
|
|
|
|
|
|
|
|
char *
|
2015-10-20 11:54:09 +00:00
|
|
|
__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
|
2007-09-19 20:35:36 +00:00
|
|
|
{
|
|
|
|
unsigned char alt_result[32]
|
|
|
|
__attribute__ ((__aligned__ (__alignof__ (uint32_t))));
|
|
|
|
unsigned char temp_result[32]
|
|
|
|
__attribute__ ((__aligned__ (__alignof__ (uint32_t))));
|
|
|
|
size_t salt_len;
|
|
|
|
size_t key_len;
|
|
|
|
size_t cnt;
|
|
|
|
char *cp;
|
|
|
|
char *copied_key = NULL;
|
|
|
|
char *copied_salt = NULL;
|
|
|
|
char *p_bytes;
|
|
|
|
char *s_bytes;
|
|
|
|
/* Default number of rounds. */
|
|
|
|
size_t rounds = ROUNDS_DEFAULT;
|
|
|
|
bool rounds_custom = false;
|
2012-03-30 15:45:44 +00:00
|
|
|
size_t alloca_used = 0;
|
|
|
|
char *free_key = NULL;
|
|
|
|
char *free_pbytes = NULL;
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Find beginning of salt string. The prefix should normally always
|
|
|
|
be present. Just in case it is not. */
|
|
|
|
if (strncmp (sha256_salt_prefix, salt, sizeof (sha256_salt_prefix) - 1) == 0)
|
|
|
|
/* Skip salt prefix. */
|
|
|
|
salt += sizeof (sha256_salt_prefix) - 1;
|
|
|
|
|
|
|
|
if (strncmp (salt, sha256_rounds_prefix, sizeof (sha256_rounds_prefix) - 1)
|
|
|
|
== 0)
|
|
|
|
{
|
|
|
|
const char *num = salt + sizeof (sha256_rounds_prefix) - 1;
|
|
|
|
char *endp;
|
|
|
|
unsigned long int srounds = strtoul (num, &endp, 10);
|
|
|
|
if (*endp == '$')
|
|
|
|
{
|
|
|
|
salt = endp + 1;
|
|
|
|
rounds = MAX (ROUNDS_MIN, MIN (srounds, ROUNDS_MAX));
|
|
|
|
rounds_custom = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
salt_len = MIN (strcspn (salt, "$"), SALT_LEN_MAX);
|
|
|
|
key_len = strlen (key);
|
|
|
|
|
|
|
|
if ((key - (char *) 0) % __alignof__ (uint32_t) != 0)
|
|
|
|
{
|
2012-03-30 15:45:44 +00:00
|
|
|
char *tmp;
|
|
|
|
|
|
|
|
if (__libc_use_alloca (alloca_used + key_len + __alignof__ (uint32_t)))
|
|
|
|
tmp = alloca_account (key_len + __alignof__ (uint32_t), alloca_used);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
free_key = tmp = (char *) malloc (key_len + __alignof__ (uint32_t));
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-09-19 20:35:36 +00:00
|
|
|
key = copied_key =
|
|
|
|
memcpy (tmp + __alignof__ (uint32_t)
|
|
|
|
- (tmp - (char *) 0) % __alignof__ (uint32_t),
|
|
|
|
key, key_len);
|
|
|
|
assert ((key - (char *) 0) % __alignof__ (uint32_t) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((salt - (char *) 0) % __alignof__ (uint32_t) != 0)
|
|
|
|
{
|
|
|
|
char *tmp = (char *) alloca (salt_len + __alignof__ (uint32_t));
|
2012-03-30 15:45:44 +00:00
|
|
|
alloca_used += salt_len + __alignof__ (uint32_t);
|
2007-09-19 20:35:36 +00:00
|
|
|
salt = copied_salt =
|
|
|
|
memcpy (tmp + __alignof__ (uint32_t)
|
|
|
|
- (tmp - (char *) 0) % __alignof__ (uint32_t),
|
|
|
|
salt, salt_len);
|
|
|
|
assert ((salt - (char *) 0) % __alignof__ (uint32_t) == 0);
|
|
|
|
}
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
/* Initialize libfreebl3. */
|
|
|
|
NSSLOWInitContext *nss_ictx = NSSLOW_Init ();
|
|
|
|
if (nss_ictx == NULL)
|
2012-03-30 15:45:44 +00:00
|
|
|
{
|
|
|
|
free (free_key);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-02 17:00:46 +00:00
|
|
|
NSSLOWHASHContext *nss_ctx = NULL;
|
|
|
|
NSSLOWHASHContext *nss_alt_ctx = NULL;
|
|
|
|
#else
|
|
|
|
struct sha256_ctx ctx;
|
|
|
|
struct sha256_ctx alt_ctx;
|
|
|
|
#endif
|
|
|
|
|
2007-09-19 20:35:36 +00:00
|
|
|
/* Prepare for the real work. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_init_ctx (&ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add the key string. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (key, key_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
2007-11-10 19:36:06 +00:00
|
|
|
/* The last part is the salt string. This must be at most 16
|
|
|
|
characters and it ends at the first `$' character. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (salt, salt_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Compute alternate SHA256 sum with input KEY, SALT, and KEY. The
|
|
|
|
final result will be added to the first context. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_init_ctx (&alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add key. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add salt. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (salt, salt_len, &alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add key again. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Now get result of this (32 bytes) and add it to the other
|
|
|
|
context. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_finish_ctx (&alt_ctx, nss_alt_ctx, alt_result);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add for any character in the key one byte of the alternate sum. */
|
|
|
|
for (cnt = key_len; cnt > 32; cnt -= 32)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (alt_result, 32, &ctx, nss_ctx);
|
|
|
|
sha256_process_bytes (alt_result, cnt, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Take the binary representation of the length of the key and for every
|
|
|
|
1 add the alternate sum, for every 0 the key. */
|
|
|
|
for (cnt = key_len; cnt > 0; cnt >>= 1)
|
|
|
|
if ((cnt & 1) != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (alt_result, 32, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
else
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (key, key_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_finish_ctx (&ctx, nss_ctx, alt_result);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Start computation of P byte sequence. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_init_ctx (&alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* For every character in the password add the entire password. */
|
|
|
|
for (cnt = 0; cnt < key_len; ++cnt)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (key, key_len, &alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Finish the digest. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Create byte sequence P. */
|
2012-03-30 15:45:44 +00:00
|
|
|
if (__libc_use_alloca (alloca_used + key_len))
|
|
|
|
cp = p_bytes = (char *) alloca (key_len);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
free_pbytes = cp = p_bytes = (char *)malloc (key_len);
|
|
|
|
if (free_pbytes == NULL)
|
|
|
|
{
|
|
|
|
free (free_key);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-19 20:35:36 +00:00
|
|
|
for (cnt = key_len; cnt >= 32; cnt -= 32)
|
|
|
|
cp = mempcpy (cp, temp_result, 32);
|
|
|
|
memcpy (cp, temp_result, cnt);
|
|
|
|
|
|
|
|
/* Start computation of S byte sequence. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_init_ctx (&alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* For every character in the password add the entire password. */
|
|
|
|
for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (salt, salt_len, &alt_ctx, nss_alt_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Finish the digest. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_finish_ctx (&alt_ctx, nss_alt_ctx, temp_result);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Create byte sequence S. */
|
|
|
|
cp = s_bytes = alloca (salt_len);
|
|
|
|
for (cnt = salt_len; cnt >= 32; cnt -= 32)
|
|
|
|
cp = mempcpy (cp, temp_result, 32);
|
|
|
|
memcpy (cp, temp_result, cnt);
|
|
|
|
|
|
|
|
/* Repeatedly run the collected hash value through SHA256 to burn
|
|
|
|
CPU cycles. */
|
|
|
|
for (cnt = 0; cnt < rounds; ++cnt)
|
|
|
|
{
|
|
|
|
/* New context. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_init_ctx (&ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
else
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (alt_result, 32, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add salt for numbers not divisible by 3. */
|
|
|
|
if (cnt % 3 != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (s_bytes, salt_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add key for numbers not divisible by 7. */
|
|
|
|
if (cnt % 7 != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Add key or last result. */
|
|
|
|
if ((cnt & 1) != 0)
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (alt_result, 32, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
else
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_process_bytes (p_bytes, key_len, &ctx, nss_ctx);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
|
|
|
/* Create intermediate result. */
|
2009-04-02 17:00:46 +00:00
|
|
|
sha256_finish_ctx (&ctx, nss_ctx, alt_result);
|
2007-09-19 20:35:36 +00:00
|
|
|
}
|
|
|
|
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifdef USE_NSS
|
|
|
|
/* Free libfreebl3 resources. */
|
|
|
|
NSSLOW_Shutdown (nss_ictx);
|
|
|
|
#endif
|
|
|
|
|
2007-09-19 20:35:36 +00:00
|
|
|
/* Now we can construct the result string. It consists of three
|
|
|
|
parts. */
|
|
|
|
cp = __stpncpy (buffer, sha256_salt_prefix, MAX (0, buflen));
|
|
|
|
buflen -= sizeof (sha256_salt_prefix) - 1;
|
|
|
|
|
|
|
|
if (rounds_custom)
|
|
|
|
{
|
2016-11-16 22:46:48 +00:00
|
|
|
int n = __snprintf (cp, MAX (0, buflen), "%s%zu$",
|
|
|
|
sha256_rounds_prefix, rounds);
|
2007-09-19 20:35:36 +00:00
|
|
|
cp += n;
|
|
|
|
buflen -= n;
|
|
|
|
}
|
|
|
|
|
|
|
|
cp = __stpncpy (cp, salt, MIN ((size_t) MAX (0, buflen), salt_len));
|
|
|
|
buflen -= MIN ((size_t) MAX (0, buflen), salt_len);
|
|
|
|
|
|
|
|
if (buflen > 0)
|
|
|
|
{
|
|
|
|
*cp++ = '$';
|
|
|
|
--buflen;
|
|
|
|
}
|
|
|
|
|
2014-06-03 11:09:08 +00:00
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[0], alt_result[10], alt_result[20], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[21], alt_result[1], alt_result[11], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[12], alt_result[22], alt_result[2], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[3], alt_result[13], alt_result[23], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[24], alt_result[4], alt_result[14], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[15], alt_result[25], alt_result[5], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[6], alt_result[16], alt_result[26], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[27], alt_result[7], alt_result[17], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[18], alt_result[28], alt_result[8], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
alt_result[9], alt_result[19], alt_result[29], 4);
|
|
|
|
__b64_from_24bit (&cp, &buflen,
|
|
|
|
0, alt_result[31], alt_result[30], 3);
|
2007-09-19 20:35:36 +00:00
|
|
|
if (buflen <= 0)
|
|
|
|
{
|
|
|
|
__set_errno (ERANGE);
|
|
|
|
buffer = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*cp = '\0'; /* Terminate the string. */
|
|
|
|
|
|
|
|
/* Clear the buffer for the intermediate result so that people
|
|
|
|
attaching to processes or reading core dumps cannot get any
|
|
|
|
information. We do it in this way to clear correct_words[]
|
|
|
|
inside the SHA256 implementation as well. */
|
2009-04-02 17:00:46 +00:00
|
|
|
#ifndef USE_NSS
|
2007-09-19 20:35:36 +00:00
|
|
|
__sha256_init_ctx (&ctx);
|
|
|
|
__sha256_finish_ctx (&ctx, alt_result);
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (&ctx, sizeof (ctx));
|
|
|
|
explicit_bzero (&alt_ctx, sizeof (alt_ctx));
|
2009-04-02 17:00:46 +00:00
|
|
|
#endif
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (temp_result, sizeof (temp_result));
|
|
|
|
explicit_bzero (p_bytes, key_len);
|
|
|
|
explicit_bzero (s_bytes, salt_len);
|
2007-09-19 20:35:36 +00:00
|
|
|
if (copied_key != NULL)
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (copied_key, key_len);
|
2007-09-19 20:35:36 +00:00
|
|
|
if (copied_salt != NULL)
|
New string function explicit_bzero (from OpenBSD).
explicit_bzero(s, n) is the same as memset(s, 0, n), except that the
compiler is not allowed to delete a call to explicit_bzero even if the
memory pointed to by 's' is dead after the call. Right now, this effect
is achieved externally by having explicit_bzero be a function whose
semantics are unknown to the compiler, and internally, with a no-op
asm statement that clobbers memory. This does mean that small
explicit_bzero operations cannot be expanded inline as small memset
operations can, but on the other hand, small memset operations do get
deleted by the compiler. Hopefully full compiler support for
explicit_bzero will happen relatively soon.
There are two new tests: test-explicit_bzero.c verifies the
visible semantics in the same way as the existing test-bzero.c,
and tst-xbzero-opt.c verifies the not-being-optimized-out property.
The latter is conceptually based on a test written by Matthew Dempsky
for the OpenBSD regression suite.
The crypt() implementation has an immediate use for this new feature.
We avoid having to add a GLIBC_PRIVATE alias for explicit_bzero
by running all of libcrypt's calls through the fortified variant,
__explicit_bzero_chk, which is in the impl namespace anyway. Currently
I'm not aware of anything in libc proper that needs this, but the
glue is all in place if it does become necessary. The legacy DES
implementation wasn't bothering to clear its buffers, so I added that,
mostly for consistency's sake.
* string/explicit_bzero.c: New routine.
* string/test-explicit_bzero.c, string/tst-xbzero-opt.c: New tests.
* string/Makefile (routines, strop-tests, tests): Add them.
* string/test-memset.c: Add ifdeffage for testing explicit_bzero.
* string/string.h [__USE_MISC]: Declare explicit_bzero.
* debug/explicit_bzero_chk.c: New routine.
* debug/Makefile (routines): Add it.
* debug/tst-chk1.c: Test fortification of explicit_bzero.
* string/bits/string3.h: Fortify explicit_bzero.
* manual/string.texi: Document explicit_bzero.
* NEWS: Mention addition of explicit_bzero.
* crypt/crypt-entry.c (__crypt_r): Clear key-dependent intermediate
data before returning, using explicit_bzero.
* crypt/md5-crypt.c (__md5_crypt_r): Likewise.
* crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
* crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
* include/string.h: Redirect internal uses of explicit_bzero
to __explicit_bzero_chk[_internal].
* string/Versions [GLIBC_2.25]: Add explicit_bzero.
* debug/Versions [GLIBC_2.25]: Add __explicit_bzero_chk.
* sysdeps/arm/nacl/libc.abilist
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add entries for explicit_bzero and __explicit_bzero_chk.
2016-09-15 11:29:44 +00:00
|
|
|
explicit_bzero (copied_salt, salt_len);
|
2007-09-19 20:35:36 +00:00
|
|
|
|
2012-03-30 15:45:44 +00:00
|
|
|
free (free_key);
|
|
|
|
free (free_pbytes);
|
2007-09-19 20:35:36 +00:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef _LIBC
|
|
|
|
# define libc_freeres_ptr(decl) decl
|
|
|
|
#endif
|
|
|
|
libc_freeres_ptr (static char *buffer);
|
|
|
|
|
|
|
|
/* This entry point is equivalent to the `crypt' function in Unix
|
|
|
|
libcs. */
|
|
|
|
char *
|
|
|
|
__sha256_crypt (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'. */
|
|
|
|
static int buflen;
|
|
|
|
int needed = (sizeof (sha256_salt_prefix) - 1
|
|
|
|
+ sizeof (sha256_rounds_prefix) + 9 + 1
|
|
|
|
+ strlen (salt) + 1 + 43 + 1);
|
|
|
|
|
|
|
|
if (buflen < needed)
|
|
|
|
{
|
|
|
|
char *new_buffer = (char *) realloc (buffer, needed);
|
|
|
|
if (new_buffer == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
buffer = new_buffer;
|
|
|
|
buflen = needed;
|
|
|
|
}
|
|
|
|
|
|
|
|
return __sha256_crypt_r (key, salt, buffer, buflen);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef _LIBC
|
|
|
|
static void
|
|
|
|
__attribute__ ((__destructor__))
|
|
|
|
free_mem (void)
|
|
|
|
{
|
|
|
|
free (buffer);
|
|
|
|
}
|
|
|
|
#endif
|