Commit 6500b67d authored by Franco Biasin's avatar Franco Biasin
Browse files

ghidra: 12.0.2 -> 12.0.4

parent e291c0d2

pkgs/tools/security/ghidra/build.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
let

  pkg_path = "$out/lib/ghidra";

  pname = "ghidra";

  version = "12.0.2";

  version = "12.0.4";



  isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
@@ -30,7 +30,7 @@ let 
    owner = "NationalSecurityAgency";

    repo = "Ghidra";

    rev = "Ghidra_${version}_build";

    hash = "sha256-sJINXAV43oKFOqEiVSfNcJXooLlju0GsogZ5bQoXewc=";

    hash = "sha256-ETRsLbnE4RU+MdmSxMHNIbevYsZhgrzqQDQmBojchLk=";

    # populate values that require us to use git. By doing this in postFetch we

    # can delete .git afterwards and maintain better reproducibility of the src.

    leaveDotGit = true;

pkgs/tools/security/ghidra/deps.json

+12 −12
Original line number Diff line number Diff line
@@ -104,40 +104,40 @@ 
  }

 },

 "https://github.com": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/Debugger/dbgmodel": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/Debugger/dbgmodel": {

   "tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x64": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x64": {

   "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x86": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x86": {

   "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x64": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x64": {

   "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x86": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x86": {

   "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x64": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x64": {

   "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x86": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x86": {

   "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x64": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x64": {

   "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x86": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x86": {

   "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x64": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x64": {

   "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x86": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x86": {

   "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="

  },

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/lib/java-sarif-2.1-modified": {

  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/lib/java-sarif-2.1-modified": {

   "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="

  },

  "Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": {

pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
let

  # Incorporates source from binutils

  # https://github.com/NationalSecurityAgency/ghidra/blob/7ab9bf6abffb6938d61d072040fc34ad3331332b/GPL/GnuDisassembler/build.gradle#L34-L35

  binutils-version = "2.41";

  binutils-version = "2.44";

  binutils-src = fetchurl {

    url = "mirror://gnu/binutils/binutils-${binutils-version}.tar.bz2";

    sha256 = "sha256-pMS+wFL3uDcAJOYDieGUN38/SLVmGEGOpRBn9nqqsws=";

    sha256 = "sha256-9mOQpmH6oRfQD6suec8tydCXtCzClr8/hnfR57RS3Do=";

  };

in

buildGhidraExtension {
@@ -29,6 +29,8 @@ buildGhidraExtension { 


  postPatch = ''

    ln -s ${binutils-src} binutils-${binutils-version}.tar.bz2

    substituteInPlace build.gradle \

      --replace-fail 'ext.binutils = "binutils-2.41"' 'ext.binutils = "binutils-${binutils-version}"'

  '';



  # Don't modify ELF stub resources