From 67921f5f3db6055b35bb26a5871dd2c28e9826bd Mon Sep 17 00:00:00 2001
From: colezlaw <will@cltnc.us>
Date: Mon, 20 Feb 2017 15:35:52 -0500
Subject: [PATCH] Updated GrokAssembly and added config

---
 .../analyzer/AssemblyAnalyzer.java            |   6 ++++++
 .../src/main/resources/GrokAssembly.exe       | Bin 6144 -> 6656 bytes
 .../main/resources/GrokAssembly.exe.config    |   6 ++++++
 3 files changed, 12 insertions(+)
 create mode 100755 dependency-check-core/src/main/resources/GrokAssembly.exe.config

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
index fc164ca1d..348dd6f6c 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
@@ -214,6 +214,12 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
 
             grokAssemblyExe = tempFile;
             LOGGER.debug("Extracted GrokAssembly.exe to {}", grokAssemblyExe.getPath());
+
+            String cfg = grokAssemblyExe.getPath() + ".config";
+            fos = new FileOutputStream(cfg);
+            is = AssemblyAnalyzer.class.getClassLoader().getResourceAsStream("GrokAssembly.exe.config");
+            IOUtils.copy(is, fos);
+            LOGGER.debug("Extracted GrokAssembly.exe.config to {}", cfg);
         } catch (IOException ioe) {
             this.setEnabled(false);
             LOGGER.warn("Could not extract GrokAssembly.exe: {}", ioe.getMessage());
diff --git a/dependency-check-core/src/main/resources/GrokAssembly.exe b/dependency-check-core/src/main/resources/GrokAssembly.exe
index a68ce50e1cd37e4a53e47d979fe233fd254275cc..902620b8fcd95458141258b256e8e1efd6ab7356 100644
GIT binary patch
delta 915
zcmZ9KO-NKx6vzMPz2`WN&Nwrsj;S%@6D>sZi!u8!Ei)|&LG1$y%QUgfsnHe^<jlgN
zMKIIFYFD-@(2cXn3K9y6N-$bP3oXHoMA{dHXwbP=A?QBN@1D>5&bi!Bai}~pY_&qI
zh3JFBj=M#`erZ+%9wX{Y5k6|ApCU~8HjlCDheeE00eQp><#?yKK(2Zg4RLsA0&_M%
zS2m}HoyFpac7mG4xVD|PiC>yY^J2Zena0IF{S}c&H42zDhR;QSCEx&T)<80IIwE=v
zQv?mSxNo?rUOYCuX<4@ETs}L`8cYGs2kbICI4CBKTpAJIjT@;P#C4WUd|HkM$m|Re
zj?1rn!<Km&*uu@#^Dt&pU$CpEvsYGx;(_N}VYW1(HUV(5&)nP6P|JI>n2jrN@nAgR
zKgko>mJITX3d_(yJX!EeI|vKrv>w)%6+ODtD-;_Q&njNg@8}kc>y!FbeBxd#Sk&#@
z55Ns55<=ueI&5&UkI?9q{wUsQ)ohI@>n1*GmsCe2n&L+XCN;ua)WDAqinEISit~!!
z6qgi<WM%^M5M?k4Mfi*e^9SxRm+_ma(;sFcNq-7isR)@Q{U&W-y?~B0%jh)qBD@i;
zFhX(!LZ8Rp4Yl|sKuxx4Vvq{Os5LA0!aAnubzR-DGl@eKBYQRN+I;{g(ZkY-4z$C|
zS}%VcIEOZLqn|yeR7MX1=wqvmV_uE~*xN2^#7;+z^U>DI;Dy)eb;IQ&7sF4UuEZja
zV?@`)m*g^+Y~tnGgO&P>D0F7hRII_dhlImjWuK7Gc5O|FqwcaKdv~8ljwE+++kJw(
zV##gNN-R62i(I9AhsAs!rKn)dkCND}bvsC}MY4FG>dP$QkQ6^B{GaGbTc89lki@_H
NS`~ApEmE{N{x2H2ti%8S

delta 820
zcmY+CK}b|l6o&uv-t#$(Gt<nQOhc3zXG&>cnou&yOa~()s0pzWDqR(3sHhY{<VfmH
za5`BDEmDMN(IQ`gpb;%v7!=f|f{a?uq9R&|XwbRW2s&`TbI#8_=iYbT&DLg9lQSM0
z+In*jPX!`L;HXNQfDJPj4Re$_X^2Ot%DZ81>acj8610s!Q)MJ01<G1w87RPL47le7
z)LvOOQz+%BFsjP|?=H?5U6kU-MgukQcOynG*)ez16sOHsWU${#2<xqA$dJmufRuRp
zwg^`)agP<_dCTGZmJ^Ok@1353Fwo!USDOZ!Id8@376%G$@<Ktp{)04#T?bm^3i~XH
z+lB_ZdoK)1A+8kySrV<i4I3UHC|c}r`;iv$J}$Nsp-PFQf&K>NtN4Vyo#NbMPYoY~
zjdw;b*~n|!riyoHHfnZg4w)0CjR)qUc>{0MAh2SttD!)S)>J--5_l03jgW~beY~_;
zXQy?R!waKH@+UgGjn{mo@agcPL5M=_TNducTg{J}S2e$C<~4t6u4xiA<0OTIgd~1p
zQn-#;p-HR4BKj>1lhVt`LrKK6o}dbeYv`<Sf11wIAV$y$E2}<-uv9XghBo>0ka_>J
zF)GvP|Jp@2?^!Thw`iQ)I)9q@S>RxBVzGMt`Q>lNXIAsZ=xoI&*SF;i(HM6JYy7Q$
zUzzHAjvocfDB~^%4-p4LSq?aj{y9C`&12`d!>RF2r<Y39-IV9MP8V6c=EUfWTORI~
sH;FnKToQZ4r%;P}_s-S>WLCrA_r*~sve^lcz$bBkqZ=yyLAg}nAK)*RuK)l5

diff --git a/dependency-check-core/src/main/resources/GrokAssembly.exe.config b/dependency-check-core/src/main/resources/GrokAssembly.exe.config
new file mode 100755
index 000000000..9b6e29ded
--- /dev/null
+++ b/dependency-check-core/src/main/resources/GrokAssembly.exe.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0"/>
+  </startup>
+</configuration>
\ No newline at end of file