uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
96
pkgs/development/libraries/libressl/default.nix
Normal file
96
pkgs/development/libraries/libressl/default.nix
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, cmake
|
||||
, cacert
|
||||
, fetchpatch
|
||||
, buildShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
let
|
||||
ldLibPathEnvName = if stdenv.isDarwin
|
||||
then "DYLD_LIBRARY_PATH"
|
||||
else "LD_LIBRARY_PATH";
|
||||
|
||||
generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec {
|
||||
pname = "libressl";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_NC=ON"
|
||||
# Ensure that the output libraries do not require an executable stack.
|
||||
# Without this define, assembly files in libcrypto do not include a
|
||||
# .note.GNU-stack section, and if that section is missing from any object,
|
||||
# the linker will make the stack executable.
|
||||
"-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
|
||||
# libressl will append this to the regular prefix for libdir
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
] ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
# The autoconf build is broken as of 2.9.1, resulting in the following error:
|
||||
# libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'.
|
||||
# Fortunately LibreSSL provides a CMake build as well, so opt for CMake by
|
||||
# removing ./configure pre-config.
|
||||
preConfigure = ''
|
||||
rm configure
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \
|
||||
--replace 'libdir \''${exec_prefix}' 'libdir \''${prefix}'
|
||||
'';
|
||||
|
||||
inherit patches;
|
||||
|
||||
# Since 2.9.x the default location can't be configured from the build using
|
||||
# DEFAULT_CA_FILE anymore, instead we have to patch the default value.
|
||||
postPatch = ''
|
||||
patchShebangs tests/
|
||||
${lib.optionalString (lib.versionAtLeast version "2.9.2") ''
|
||||
substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"'
|
||||
''}
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName}
|
||||
export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)"
|
||||
'';
|
||||
postCheck = ''
|
||||
export ${ldLibPathEnvName}=$PREVIOUS_${ldLibPathEnvName}
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "nc" ];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput "bin/nc" "$nc"
|
||||
moveToOutput "bin/openssl" "$bin"
|
||||
moveToOutput "bin/ocspcheck" "$bin"
|
||||
moveToOutput "share/man/man1/nc.1.gz" "$nc"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free TLS/SSL implementation";
|
||||
homepage = "https://www.libressl.org";
|
||||
license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice fpletz ];
|
||||
};
|
||||
};
|
||||
|
||||
in {
|
||||
libressl_3_4 = generic {
|
||||
version = "3.4.3";
|
||||
sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
|
||||
};
|
||||
|
||||
libressl_3_5 = generic {
|
||||
version = "3.5.2";
|
||||
sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8=";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c
|
||||
index 34c60baa8a..9c0e917829 100644
|
||||
--- a/tests/explicit_bzero.c
|
||||
+++ b/tests/explicit_bzero.c
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $ */
|
||||
+/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2014 Google Inc.
|
||||
*
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -36,19 +37,33 @@ enum {
|
||||
SECRETBYTES = SECRETCOUNT * sizeof(secret)
|
||||
};
|
||||
|
||||
-static char altstack[SIGSTKSZ + SECRETBYTES];
|
||||
+/*
|
||||
+ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer
|
||||
+ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ).
|
||||
+ */
|
||||
+static char *altstack;
|
||||
+#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES)
|
||||
|
||||
static void
|
||||
setup_stack(void)
|
||||
{
|
||||
+ altstack = calloc(1, ALTSTACK_SIZE);
|
||||
+ ASSERT_NE(NULL, altstack);
|
||||
+
|
||||
const stack_t sigstk = {
|
||||
.ss_sp = altstack,
|
||||
- .ss_size = sizeof(altstack),
|
||||
+ .ss_size = ALTSTACK_SIZE
|
||||
};
|
||||
|
||||
ASSERT_EQ(0, sigaltstack(&sigstk, NULL));
|
||||
}
|
||||
|
||||
+static void
|
||||
+cleanup_stack(void)
|
||||
+{
|
||||
+ free(altstack);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
assert_on_stack(void)
|
||||
{
|
||||
@@ -129,7 +144,7 @@ test_without_bzero()
|
||||
char buf[SECRETBYTES];
|
||||
assert_on_stack();
|
||||
populate_secret(buf, sizeof(buf));
|
||||
- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
|
||||
+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
|
||||
ASSERT_NE(NULL, res);
|
||||
return (res);
|
||||
}
|
||||
@@ -140,7 +155,7 @@ test_with_bzero()
|
||||
char buf[SECRETBYTES];
|
||||
assert_on_stack();
|
||||
populate_secret(buf, sizeof(buf));
|
||||
- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
|
||||
+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
|
||||
ASSERT_NE(NULL, res);
|
||||
explicit_bzero(buf, sizeof(buf));
|
||||
return (res);
|
||||
@@ -183,15 +198,17 @@ main()
|
||||
* on the stack. This sanity checks that call_on_stack() and
|
||||
* populate_secret() work as intended.
|
||||
*/
|
||||
- memset(altstack, 0, sizeof(altstack));
|
||||
+ memset(altstack, 0, ALTSTACK_SIZE);
|
||||
call_on_stack(do_test_without_bzero);
|
||||
|
||||
/*
|
||||
* Now test with a call to explicit_bzero() and check that we
|
||||
* *don't* find any instances of the secret data.
|
||||
*/
|
||||
- memset(altstack, 0, sizeof(altstack));
|
||||
+ memset(altstack, 0, ALTSTACK_SIZE);
|
||||
call_on_stack(do_test_with_bzero);
|
||||
|
||||
+ cleanup_stack();
|
||||
+
|
||||
return (0);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue