Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 668314
Collapse All | Expand All

(-)u-boot-2018.05.orig/lib/rsa/rsa-sign.c (-7 / +14 lines)
Lines 16-26 Link Here
16
#include <openssl/evp.h>
16
#include <openssl/evp.h>
17
#include <openssl/engine.h>
17
#include <openssl/engine.h>
18
18
19
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
19
#if OPENSSL_VERSION_NUMBER >= 0x10000000L || \
20
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
20
#define HAVE_ERR_REMOVE_THREAD_STATE
21
#define HAVE_ERR_REMOVE_THREAD_STATE
21
#endif
22
#endif
22
23
23
#if OPENSSL_VERSION_NUMBER < 0x10100000L
24
#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
25
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
24
static void RSA_get0_key(const RSA *r,
26
static void RSA_get0_key(const RSA *r,
25
                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
27
                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
26
{
28
{
Lines 299-305 static int rsa_init(void) Link Here
299
{
301
{
300
	int ret;
302
	int ret;
301
303
302
#if OPENSSL_VERSION_NUMBER < 0x10100000L
304
#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
305
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
303
	ret = SSL_library_init();
306
	ret = SSL_library_init();
304
#else
307
#else
305
	ret = OPENSSL_init_ssl(0, NULL);
308
	ret = OPENSSL_init_ssl(0, NULL);
Lines 308-314 static int rsa_init(void) Link Here
308
		fprintf(stderr, "Failure to init SSL library\n");
311
		fprintf(stderr, "Failure to init SSL library\n");
309
		return -1;
312
		return -1;
310
	}
313
	}
311
#if OPENSSL_VERSION_NUMBER < 0x10100000L
314
#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
315
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
312
	SSL_load_error_strings();
316
	SSL_load_error_strings();
313
317
314
	OpenSSL_add_all_algorithms();
318
	OpenSSL_add_all_algorithms();
Lines 354-360 err_set_rsa: Link Here
354
err_engine_init:
358
err_engine_init:
355
	ENGINE_free(e);
359
	ENGINE_free(e);
356
err_engine_by_id:
360
err_engine_by_id:
357
#if OPENSSL_VERSION_NUMBER < 0x10100000L
361
#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
362
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
358
	ENGINE_cleanup();
363
	ENGINE_cleanup();
359
#endif
364
#endif
360
	return ret;
365
	return ret;
Lines 362-368 err_engine_by_id: Link Here
362
367
363
static void rsa_remove(void)
368
static void rsa_remove(void)
364
{
369
{
365
#if OPENSSL_VERSION_NUMBER < 0x10100000L
370
#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
371
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
366
	CRYPTO_cleanup_all_ex_data();
372
	CRYPTO_cleanup_all_ex_data();
367
	ERR_free_strings();
373
	ERR_free_strings();
368
#ifdef HAVE_ERR_REMOVE_THREAD_STATE
374
#ifdef HAVE_ERR_REMOVE_THREAD_STATE
Lines 432-438 static int rsa_sign_with_key(RSA *rsa, s Link Here
432
		ret = rsa_err("Could not obtain signature");
438
		ret = rsa_err("Could not obtain signature");
433
		goto err_sign;
439
		goto err_sign;
434
	}
440
	}
435
	#if OPENSSL_VERSION_NUMBER < 0x10100000L
441
	#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
442
	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
436
		EVP_MD_CTX_cleanup(context);
443
		EVP_MD_CTX_cleanup(context);
437
	#else
444
	#else
438
		EVP_MD_CTX_reset(context);
445
		EVP_MD_CTX_reset(context);

Return to bug 668314