Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7ac1a432a1373c887f6bf7b38ec238c641728479

Authored by Caliph Nomble
Committed by Tom Rini
1 parent ca230b094e
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

rsa: Fix LibreSSL before v2.7.0 

Fix LibreSSL compilation for versions before v2.7.0.

Signed-off-by: Caliph Nomble <nomble@palism.com>
Reviewed-by: Jonathan Gray <jsg@jsg.id.au>

Showing 1 changed file with 12 additions and 6 deletions Side-by-side Diff

... ... @@ -20,7 +20,8 @@
20 20 #define HAVE_ERR_REMOVE_THREAD_STATE
21 21 #endif
22 22  
23   -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  23 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  24 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
24 25 static void RSA_get0_key(const RSA *r,
25 26 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
26 27 {
... ... @@ -299,7 +300,8 @@
299 300 {
300 301 int ret;
301 302  
302   -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  303 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  304 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
303 305 ret = SSL_library_init();
304 306 #else
305 307 ret = OPENSSL_init_ssl(0, NULL);
... ... @@ -308,7 +310,8 @@
308 310 fprintf(stderr, "Failure to init SSL library\n");
309 311 return -1;
310 312 }
311   -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  313 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  314 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
312 315 SSL_load_error_strings();
313 316  
314 317 OpenSSL_add_all_algorithms();
... ... @@ -354,7 +357,8 @@
354 357 err_engine_init:
355 358 ENGINE_free(e);
356 359 err_engine_by_id:
357   -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  360 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  361 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
358 362 ENGINE_cleanup();
359 363 #endif
360 364 return ret;
... ... @@ -362,7 +366,8 @@
362 366  
363 367 static void rsa_remove(void)
364 368 {
365   -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  369 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  370 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
366 371 CRYPTO_cleanup_all_ex_data();
367 372 ERR_free_strings();
368 373 #ifdef HAVE_ERR_REMOVE_THREAD_STATE
... ... @@ -432,7 +437,8 @@
432 437 ret = rsa_err("Could not obtain signature");
433 438 goto err_sign;
434 439 }
435   - #if OPENSSL_VERSION_NUMBER < 0x10100000L
  440 + #if OPENSSL_VERSION_NUMBER < 0x10100000L || \
  441 + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
436 442 EVP_MD_CTX_cleanup(context);
437 443 #else
438 444 EVP_MD_CTX_reset(context);