summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/security/cfssl
diff options
context:
space:
mode:
authorJohan Thomsen <jth@dbc.dk>2018-08-17 11:34:31 +0200
committerJohan Thomsen <jth@dbc.dk>2018-08-17 13:00:09 +0200
commit85488545d8d5127342763adaeb36b0f283aa51fa (patch)
tree5731ffd1e0ff89dddfcb58cb95c8a0c70fbff6fd /pkgs/tools/security/cfssl
parent20aba7ae88d820558ed52772e18b1b1faa11047c (diff)
cfssl: Add patch for stripping authkey whitespaces
Diffstat (limited to 'pkgs/tools/security/cfssl')
-rw-r--r--pkgs/tools/security/cfssl/default.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index cce3370aeda1..2391ea1b859b 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
name = "cfssl-${version}";
@@ -13,6 +13,17 @@ buildGoPackage rec {
sha256 = "0j2gz2vl2pf7ir7sc7jrwmjnr67hk4qhxw09cjx132jbk337jc9x";
};
+ # The following patch ensures that the auth-key decoder doesn't break,
+ # if the auth-key file contains leading or trailing whitespaces.
+ # https://github.com/cloudflare/cfssl/pull/923 is merged
+ # remove patch when it becomes part of a release.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/cloudflare/cfssl/commit/7e13f60773c96644db9dd8d342d42fe3a4d26f36.patch";
+ sha256 = "1z2v2i8yj7qpj8zj5f2q739nhrr9s59jwzfzk52wfgssl4vv5mn5";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = https://cfssl.org/;
description = "Cloudflare's PKI and TLS toolkit";