aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-10-03 22:21:02 +0200
committerKarel Kočí <cynerd@email.cz>2022-10-03 22:21:02 +0200
commitee4cfdda0a54567735e4c30662afd3f76e1c8a61 (patch)
treeb7ee78c18115932cef8f056ee86976c69067dc91 /pkgs
parent018ea866e847e249b5ae59f8711f4b8e59c8f4ac (diff)
downloadnixturris-ee4cfdda0a54567735e4c30662afd3f76e1c8a61.tar.gz
nixturris-ee4cfdda0a54567735e4c30662afd3f76e1c8a61.tar.bz2
nixturris-ee4cfdda0a54567735e4c30662afd3f76e1c8a61.zip
crypto-wrapper: add and hopefully integrate the tools
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/crypto-wrapper/default.nix18
-rw-r--r--pkgs/default.nix15
2 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/crypto-wrapper/default.nix b/pkgs/crypto-wrapper/default.nix
index 3f431b2..1d4d20b 100644
--- a/pkgs/crypto-wrapper/default.nix
+++ b/pkgs/crypto-wrapper/default.nix
@@ -1,9 +1,15 @@
{ stdenv, lib, fetchgit
-, bash
+, bash, openssl
, makeWrapper
+, libatsha204, mox-otp
}:
+let
-stdenv.mkDerivation rec {
+ bins = [openssl]
+ ++ lib.optional (stdenv.system == "aarch64-linux") mox-otp
+ ++ lib.optional (stdenv.system == "armv7l-linux") libatsha204;
+
+in stdenv.mkDerivation rec {
pname = "crypto-wrapper";
version = "0.4";
meta = with lib; {
@@ -19,10 +25,12 @@ stdenv.mkDerivation rec {
sha256 = "1ly37cajkmgqmlj230h5az9m2m1rgvf4r0bf94yipp80wl0z215s";
};
+ nativeBuildInputs = [ makeWrapper ];
+
+
installPhase = ''
mkdir -p $out/bin
- cp crypto-wrapper.sh $out/bin/crypto-wrapper
- wrapProgram $out/bin/crypto-wrapper \
- --prefix PATH : ${lib.makeBinPath [ bash openssl coreutils ]}
+ makeWrapper crypto-wrapper.sh $out/bin/crypto-wrapper \
+ --prefix PATH : ${lib.makeBinPath bins}
'';
}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b16795d..41c28c8 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -16,22 +16,23 @@ let
# Crypto and certificates
libatsha204 = callPackage ./libatsha204 { };
mox-otp = python3Packages.callPackage ./mox-otp { };
- #crypto-wrapper = callPackage ./crypto-wrapper { };
+ crypto-wrapper = callPackage ./crypto-wrapper { };
#certgen = python3Packages.callPackage ./certgen { };
# NOR Firmwares
- ubootTurrisMox = buildUBoot {
- defconfig = "turris_mox_defconfig";
- extraMeta.platforms = ["aarch64-linux"];
- filesToInstall = ["u-boot.bin"];
- extraPatches = [ ./patches/include-configs-turris_mox-increase-space-for-the-ke.patch ];
- };
armTrustedFirmwareTurrisMox = buildArmTrustedFirmware rec {
platform = "a3700";
extraMeta.platforms = ["aarch64-linux"];
extraMakeFlags = ["USE_COHERENT_MEM=0" "CM3_SYSTEM_RESET=1" "FIP_ALIGN=0x100"];
filesToInstall = ["build/${platform}/release/bl31.bin"];
};
+ ubootTurrisMox = buildUBoot {
+ defconfig = "turris_mox_defconfig";
+ extraMeta.platforms = ["aarch64-linux"];
+ filesToInstall = ["u-boot.bin"];
+ extraPatches = [ ./patches/include-configs-turris_mox-increase-space-for-the-ke.patch ];
+ BL31 = "${armTrustedFirmwareTurrisMox}/bl31.bin";
+ };
ubootTurrisOmnia = buildUBoot {
defconfig = "turris_omnia_defconfig";
extraMeta.platforms = ["armv7l-linux"];