diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-10-14 11:44:29 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-10-14 13:36:11 +0100 |
commit | 4756a3b968d8aeac5e43bf2bb99f005e079d476e (patch) | |
tree | 1bab770698f0bc6477bde21c264861da4f69dd68 /pkgs/tools/security | |
parent | aef16f9cb42290dca27588d6229a668740a79296 (diff) | |
download | nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar.gz nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar.bz2 nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar.lz nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar.xz nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.tar.zst nixpkgs-4756a3b968d8aeac5e43bf2bb99f005e079d476e.zip |
ibm-sw-tpm2: backport openssl-3.1 support
Without the change build fails against openssl-3.1 as: > from Tpm.h:78, > from CryptEccMain.c:64: > TpmToOsslMath.h:79:5: error: #error Untested OpenSSL version > 79 | # error Untested OpenSSL version > | ^~~~~
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/ibm-sw-tpm2/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 012d492aaca..de260e06824 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, lib, openssl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, openssl +}: stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; @@ -9,6 +14,18 @@ stdenv.mkDerivation rec { hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; + patches = [ + # Backport openssl-3.1 from development branch. + # Can be removed with next release. + (fetchpatch { + name = "openssl-3.1.patch"; + url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch"; + includes = [ "TpmToOsslMath.h" ]; + stripLen = 1; + hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY="; + }) + ]; + buildInputs = [ openssl ]; sourceRoot = "src"; |