Procházet zdrojové kódy

HBSD: Resolve merge conflicts

Old LibreSSL cruft.

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
pull/9/head
Shawn Webb před 3 měsíci
rodič
revize
a29081a054
2 změnil soubory, kde provedl 0 přidání a 38 odebrání
  1. +0
    -6
      net/haproxy-devel/files/patch-include-haproxy-atomic.h
  2. +0
    -32
      sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c

+ 0
- 6
net/haproxy-devel/files/patch-include-haproxy-atomic.h Zobrazit soubor

@@ -1,12 +1,6 @@
<<<<<<< HEAD:net/haproxy-devel/files/patch-include-common-hathreads.h
--- include/common/hathreads.h.orig 2019-01-16 17:18:07 UTC
+++ include/common/hathreads.h
@@ -196,7 +196,7 @@ static inline unsigned long thread_isolated()
=======
--- include/haproxy/atomic.h.orig 2018-02-17 18:17:22.219400000 +0000
+++ include/haproxy/atomic.h 2018-02-17 18:18:44.598422000 +0000
@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit
>>>>>>> upstream/master:net/haproxy-devel/files/patch-include-haproxy-atomic.h
/* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
* have a header file regrouping all functions dealing with threads. */


+ 0
- 32
sysutils/u-boot-tools/files/patch-lib_rsa_rsa-sign.c Zobrazit soubor

@@ -1,34 +1,3 @@
<<<<<<< HEAD
--- lib/rsa/rsa-sign.c.orig 2018-03-13 12:02:19 UTC
+++ lib/rsa/rsa-sign.c
@@ -21,7 +21,7 @@
#define HAVE_ERR_REMOVE_THREAD_STATE
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
static void RSA_get0_key(const RSA *r,
const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
{
@@ -300,7 +300,7 @@ static int rsa_init(void)
{
int ret;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
ret = SSL_library_init();
#else
ret = OPENSSL_init_ssl(0, NULL);
@@ -433,7 +433,7 @@ static int rsa_sign_with_key(RSA *rsa, s
ret = rsa_err("Could not obtain signature");
goto err_sign;
}
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
EVP_MD_CTX_cleanup(context);
#else
EVP_MD_CTX_reset(context);
=======
--- lib/rsa/rsa-sign.c.orig 2020-06-27 12:26:29 UTC
+++ lib/rsa/rsa-sign.c
@@ -4,7 +4,6 @@
@@ -39,4 +8,3 @@
#include <stdio.h>
#include <string.h>
#include <image.h>
>>>>>>> upstream/master

Načítá se…
Zrušit
Uložit