mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
b9b2135d22
Loading the various built-in engines was unconditionally clearing the whole error stack. During config file processing processing a .include directive which fails results in errors being added to the stack - but we carry on anyway. These errors were then later being removed by the engine loading code, meaning that problems with the .include directive never get shown. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13311)
110 lines
2.7 KiB
C
110 lines
2.7 KiB
C
/*
|
|
* Copyright 2011-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
|
|
*/
|
|
|
|
/* We need to use some engine deprecated APIs */
|
|
#define OPENSSL_SUPPRESS_DEPRECATED
|
|
|
|
#include <openssl/opensslconf.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "crypto/engine.h"
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/rand.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/crypto.h>
|
|
|
|
#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
|
defined(__x86_64) || defined(__x86_64__) || \
|
|
defined(_M_AMD64) || defined (_M_X64)) && defined(OPENSSL_CPUID_OBJ)
|
|
|
|
size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
|
|
|
|
static int get_random_bytes(unsigned char *buf, int num)
|
|
{
|
|
if (num < 0) {
|
|
return 0;
|
|
}
|
|
|
|
return (size_t)num == OPENSSL_ia32_rdrand_bytes(buf, (size_t)num);
|
|
}
|
|
|
|
static int random_status(void)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static RAND_METHOD rdrand_meth = {
|
|
NULL, /* seed */
|
|
get_random_bytes,
|
|
NULL, /* cleanup */
|
|
NULL, /* add */
|
|
get_random_bytes,
|
|
random_status,
|
|
};
|
|
|
|
static int rdrand_init(ENGINE *e)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static const char *engine_e_rdrand_id = "rdrand";
|
|
static const char *engine_e_rdrand_name = "Intel RDRAND engine";
|
|
|
|
static int bind_helper(ENGINE *e)
|
|
{
|
|
if (!ENGINE_set_id(e, engine_e_rdrand_id) ||
|
|
!ENGINE_set_name(e, engine_e_rdrand_name) ||
|
|
!ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL) ||
|
|
!ENGINE_set_init_function(e, rdrand_init) ||
|
|
!ENGINE_set_RAND(e, &rdrand_meth))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static ENGINE *ENGINE_rdrand(void)
|
|
{
|
|
ENGINE *ret = ENGINE_new();
|
|
if (ret == NULL)
|
|
return NULL;
|
|
if (!bind_helper(ret)) {
|
|
ENGINE_free(ret);
|
|
return NULL;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void engine_load_rdrand_int(void)
|
|
{
|
|
if (OPENSSL_ia32cap_P[1] & (1 << (62 - 32))) {
|
|
ENGINE *toadd = ENGINE_rdrand();
|
|
if (!toadd)
|
|
return;
|
|
ERR_set_mark();
|
|
ENGINE_add(toadd);
|
|
/*
|
|
* If the "add" worked, it gets a structural reference. So either way, we
|
|
* release our just-created reference.
|
|
*/
|
|
ENGINE_free(toadd);
|
|
/*
|
|
* If the "add" didn't work, it was probably a conflict because it was
|
|
* already added (eg. someone calling ENGINE_load_blah then calling
|
|
* ENGINE_load_builtin_engines() perhaps).
|
|
*/
|
|
ERR_pop_to_mark();
|
|
}
|
|
}
|
|
#else
|
|
void engine_load_rdrand_int(void)
|
|
{
|
|
}
|
|
#endif
|