mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +08:00
9484b67dfb
When OpenSSL is configured using `--with-rand-seed=devrandom`, the preprocessor reports the following error crypto/info.c:104:66: error: macro "add_seeds_stringlist" passed 3 arguments, but takes just 2 add_seeds_stringlist("random-device", { DEVRANDOM, NULL }); The reason why the preprocessor complains about three arguments being passed is that according to [1], balanced braces in macro arguments don't prevent the comma from acting as an argument separator: 3.3 Macro Arguments ... Parentheses within each argument must balance; a comma within such parentheses does not end the argument. However, there is no requirement for square brackets or braces to balance, and they do not prevent a comma from separating arguments. Also introduced an iteration pointer `p`, because `dev` is not an lvalue: crypto/info.c:78:41: error: lvalue required as increment operand for (; *dev != NULL; dev++) { [1] https://gcc.gnu.org/onlinedocs/cpp/Macro-Arguments.html Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10762)
166 lines
5.8 KiB
C
166 lines
5.8 KiB
C
/*
|
|
* Copyright 2019 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/crypto.h>
|
|
#include "crypto/rand.h"
|
|
#include "crypto/dso_conf.h"
|
|
#include "internal/thread_once.h"
|
|
#include "internal/cryptlib.h"
|
|
#include "e_os.h"
|
|
#include "buildinf.h"
|
|
|
|
#if defined(__arm__) || defined(__arm) || defined(__aarch64__)
|
|
# include "arm_arch.h"
|
|
#endif
|
|
|
|
/* extern declaration to avoid warning */
|
|
extern char ossl_cpu_info_str[];
|
|
|
|
static char *seed_sources = NULL;
|
|
|
|
char ossl_cpu_info_str[128] = "";
|
|
#define CPUINFO_PREFIX "CPUINFO: "
|
|
|
|
static CRYPTO_ONCE init_info = CRYPTO_ONCE_STATIC_INIT;
|
|
|
|
DEFINE_RUN_ONCE_STATIC(init_info_strings)
|
|
{
|
|
#if defined(OPENSSL_CPUID_OBJ)
|
|
# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
|
defined(__x86_64) || defined(__x86_64__) || \
|
|
defined(_M_AMD64) || defined(_M_X64)
|
|
const char *env;
|
|
|
|
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
|
|
CPUINFO_PREFIX "OPENSSL_ia32cap=0x%llx:0x%llx",
|
|
(long long)OPENSSL_ia32cap_P[0] |
|
|
(long long)OPENSSL_ia32cap_P[1] << 32,
|
|
(long long)OPENSSL_ia32cap_P[2] |
|
|
(long long)OPENSSL_ia32cap_P[3] << 32);
|
|
if ((env = getenv("OPENSSL_ia32cap")) != NULL)
|
|
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
|
|
sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
|
|
" env:%s", env);
|
|
# elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
|
|
const char *env;
|
|
|
|
BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
|
|
CPUINFO_PREFIX "OPENSSL_armcap=0x%x", OPENSSL_armcap_P);
|
|
if ((env = getenv("OPENSSL_armcap")) != NULL)
|
|
BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
|
|
sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
|
|
" env:%s", env);
|
|
# endif
|
|
#endif
|
|
|
|
{
|
|
static char seeds[512] = "";
|
|
|
|
#define add_seeds_string(str) \
|
|
do { \
|
|
if (seeds[0] != '\0') \
|
|
OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
|
|
OPENSSL_strlcat(seeds, str, sizeof(seeds)); \
|
|
} while (0)
|
|
#define add_seeds_stringlist(label, strlist) \
|
|
do { \
|
|
add_seeds_string(label "("); \
|
|
{ \
|
|
const char *dev[] = { strlist, NULL }; \
|
|
const char **p; \
|
|
int first = 1; \
|
|
\
|
|
for (p = dev; *p != NULL; p++) { \
|
|
if (!first) \
|
|
OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
|
|
first = 0; \
|
|
OPENSSL_strlcat(seeds, *p, sizeof(seeds)); \
|
|
} \
|
|
} \
|
|
OPENSSL_strlcat(seeds, ")", sizeof(seeds)); \
|
|
} while (0)
|
|
|
|
#ifdef OPENSSL_RAND_SEED_NONE
|
|
add_seeds_string("none");
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_RTDSC
|
|
add_seeds_string("stdsc");
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_RDCPU
|
|
add_seeds_string("rdrand ( rdseed rdrand )");
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_LIBRANDOM
|
|
add_seeds_string("C-library-random");
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_GETRANDOM
|
|
add_seeds_string("getrandom-syscall");
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_DEVRANDOM
|
|
add_seeds_stringlist("random-device", DEVRANDOM);
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_EGD
|
|
add_seeds_stringlist("EGD", DEVRANDOM_EGD);
|
|
#endif
|
|
#ifdef OPENSSL_RAND_SEED_OS
|
|
add_seeds_string("os-specific");
|
|
#endif
|
|
seed_sources = seeds;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
const char *OPENSSL_info(int t)
|
|
{
|
|
/*
|
|
* We don't care about the result. Worst case scenario, the strings
|
|
* won't be initialised, i.e. remain NULL, which means that the info
|
|
* isn't available anyway...
|
|
*/
|
|
(void)RUN_ONCE(&init_info, init_info_strings);
|
|
|
|
switch (t) {
|
|
case OPENSSL_INFO_CONFIG_DIR:
|
|
return OPENSSLDIR;
|
|
case OPENSSL_INFO_ENGINES_DIR:
|
|
return ENGINESDIR;
|
|
case OPENSSL_INFO_MODULES_DIR:
|
|
return MODULESDIR;
|
|
case OPENSSL_INFO_DSO_EXTENSION:
|
|
return DSO_EXTENSION;
|
|
case OPENSSL_INFO_DIR_FILENAME_SEPARATOR:
|
|
#if defined(_WIN32)
|
|
return "\\";
|
|
#elif defined(__VMS)
|
|
return "";
|
|
#else /* Assume POSIX */
|
|
return "/";
|
|
#endif
|
|
case OPENSSL_INFO_LIST_SEPARATOR:
|
|
{
|
|
static const char list_sep[] = { LIST_SEPARATOR_CHAR, '\0' };
|
|
return list_sep;
|
|
}
|
|
case OPENSSL_INFO_SEED_SOURCE:
|
|
return seed_sources;
|
|
case OPENSSL_INFO_CPU_SETTINGS:
|
|
/*
|
|
* If successfully initialized, ossl_cpu_info_str will start
|
|
* with CPUINFO_PREFIX, if failed it will be an empty string.
|
|
* Strip away the CPUINFO_PREFIX which we don't need here.
|
|
*/
|
|
if (ossl_cpu_info_str[0] != '\0')
|
|
return ossl_cpu_info_str + strlen(CPUINFO_PREFIX);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
/* Not an error */
|
|
return NULL;
|
|
}
|