Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5299e9d5bb1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1cf3affc1616
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 25, 2020

  1. libtomcrypt: fix CVE-2019-17362 (security)

    (cherry picked from commit 5f16eca)
    wamserma committed Jun 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    05c4441 View commit details

Commits on Jun 29, 2020

  1. Merge pull request #91522 from wamserma/libtomcrypt-cve-2019-17362-ba…

    …ckport
    
    [20.03] libtomcrypt: fix CVE-2019-17362 (security, backport)
    nh2 authored Jun 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    1cf3aff View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/libraries/libtomcrypt/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/libtomcrypt/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libtool }:
{ stdenv, fetchurl, fetchpatch, libtool }:

stdenv.mkDerivation rec {
pname = "libtomcrypt";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn";
};

patches = [
(fetchpatch {
name = "CVE-2019-17362.patch";
url = "https://github.com/libtom/libtomcrypt/pull/508/commits/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94.patch";
sha256 = "1bwsj0pwffxw648wd713z3xcyrbxc2z646psrzp38ys564fjh5zf";
})
];

nativeBuildInputs = [ libtool ];

postPatch = ''