mirror of
https://github.com/openssl/openssl.git
synced 2025-01-18 13:44:20 +08:00
660c534435
The commit claimed to make things more consistent. In fact it makes it
less so. Revert back to the previous namig convention.
This reverts commit 765d04c946.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12186)
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/*
|
|
* Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/evp.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/kdf.h>
|
|
#include <openssl/core_names.h>
|
|
#include "internal/numbers.h"
|
|
|
|
#ifndef OPENSSL_NO_SCRYPT
|
|
|
|
/*
|
|
* Maximum permitted memory allow this to be overridden with Configuration
|
|
* option: e.g. -DSCRYPT_MAX_MEM=0 for maximum possible.
|
|
*/
|
|
|
|
#ifdef SCRYPT_MAX_MEM
|
|
# if SCRYPT_MAX_MEM == 0
|
|
# undef SCRYPT_MAX_MEM
|
|
/*
|
|
* Although we could theoretically allocate SIZE_MAX memory that would leave
|
|
* no memory available for anything else so set limit as half that.
|
|
*/
|
|
# define SCRYPT_MAX_MEM (SIZE_MAX/2)
|
|
# endif
|
|
#else
|
|
/* Default memory limit: 32 MB */
|
|
# define SCRYPT_MAX_MEM (1024 * 1024 * 32)
|
|
#endif
|
|
|
|
int EVP_PBE_scrypt(const char *pass, size_t passlen,
|
|
const unsigned char *salt, size_t saltlen,
|
|
uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
|
|
unsigned char *key, size_t keylen)
|
|
{
|
|
const char *empty = "";
|
|
int rv = 1;
|
|
EVP_KDF *kdf;
|
|
EVP_KDF_CTX *kctx;
|
|
OSSL_PARAM params[7], *z = params;
|
|
|
|
if (r > UINT32_MAX || p > UINT32_MAX) {
|
|
EVPerr(EVP_F_EVP_PBE_SCRYPT, EVP_R_PARAMETER_TOO_LARGE);
|
|
return 0;
|
|
}
|
|
|
|
/* Maintain existing behaviour. */
|
|
if (pass == NULL) {
|
|
pass = empty;
|
|
passlen = 0;
|
|
}
|
|
if (salt == NULL) {
|
|
salt = (const unsigned char *)empty;
|
|
saltlen = 0;
|
|
}
|
|
if (maxmem == 0)
|
|
maxmem = SCRYPT_MAX_MEM;
|
|
|
|
kdf = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_SCRYPT, NULL);
|
|
kctx = EVP_KDF_CTX_new(kdf);
|
|
EVP_KDF_free(kdf);
|
|
if (kctx == NULL)
|
|
return 0;
|
|
|
|
*z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
|
|
(unsigned char *)pass,
|
|
passlen);
|
|
*z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
|
|
(unsigned char *)salt, saltlen);
|
|
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_N, &N);
|
|
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_R, &r);
|
|
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_P, &p);
|
|
*z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_MAXMEM, &maxmem);
|
|
*z = OSSL_PARAM_construct_end();
|
|
if (EVP_KDF_CTX_set_params(kctx, params) != 1
|
|
|| EVP_KDF_derive(kctx, key, keylen) != 1)
|
|
rv = 0;
|
|
|
|
EVP_KDF_CTX_free(kctx);
|
|
return rv;
|
|
}
|
|
|
|
#endif
|