diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0836.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0836.cs index 97d5da3..8ea6638 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0836.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0836.cs @@ -96,7 +96,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0841.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0841.cs index da74277..9aaffcd 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0841.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-0841.cs @@ -73,7 +73,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1064.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1064.cs index b9e73f5..c1257c5 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1064.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1064.cs @@ -93,7 +93,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1130.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1130.cs index d58b308..8114b77 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1130.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1130.cs @@ -100,7 +100,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1253.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1253.cs index 95aac03..72078b5 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1253.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1253.cs @@ -77,7 +77,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1315.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1315.cs index f1f0704..1347d17 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1315.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1315.cs @@ -91,7 +91,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1385.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1385.cs index b0e8791..e389748 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1385.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1385.cs @@ -74,7 +74,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1388.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1388.cs index 6e04b88..6c1daea 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1388.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1388.cs @@ -80,7 +80,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1405.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1405.cs index f190734..5ba7aa6 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1405.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2019-1405.cs @@ -92,7 +92,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0668.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0668.cs index 8226172..6918ebf 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0668.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0668.cs @@ -89,7 +89,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0683.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0683.cs index 7e0c006..89d9d36 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0683.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0683.cs @@ -89,7 +89,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0796.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0796.cs new file mode 100644 index 0000000..3990b7c --- /dev/null +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-0796.cs @@ -0,0 +1,35 @@ +using System.Linq; +using System.Collections.Generic; + +namespace winPEAS._3rdParty.Watson.Msrc +{ + internal static class CVE_2020_0796 + { + private const string name = "CVE-2020-0796"; + + public static void Check(VulnerabilityCollection vulnerabilities, int buildNumber, List installedKBs) + { + var supersedence = new List(); + + switch (buildNumber) + { + case 18362: + case 18363: + + supersedence.AddRange(new int[] { + 4551762 + }); + + break; + + default: + return; + } + + if (!supersedence.Intersect(installedKBs).Any()) + { + vulnerabilities.SetAsVulnerable(name); + } + } + } +} diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-1013.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-1013.cs index 6e7f2a5..66a7bdc 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-1013.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Msrc/CVE-2020-1013.cs @@ -81,7 +81,7 @@ namespace winPEAS._3rdParty.Watson.Msrc return; } - if (supersedence.Intersect(installedKBs).Any()) + if (!supersedence.Intersect(installedKBs).Any()) { vulnerabilities.SetAsVulnerable(name); } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/VulnerabilityCollection.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/VulnerabilityCollection.cs index 0ab6628..69ca195 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/VulnerabilityCollection.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/VulnerabilityCollection.cs @@ -100,6 +100,10 @@ namespace winPEAS._3rdParty.Watson new Vulnerability( id: "CVE-2020-1013", exploits: new string[] { "https://www.gosecure.net/blog/2020/09/08/wsus-attacks-part-2-cve-2020-1013-a-windows-10-local-privilege-escalation-1-day/" } + ), + new Vulnerability( + id: "CVE-2020-0796", + exploits: new string[] { "https://github.com/danigargu/CVE-2020-0796 (smbghost)" } ) }; } diff --git a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Watson.cs b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Watson.cs index 90abce6..fbf64cc 100644 --- a/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Watson.cs +++ b/winPEAS/winPEASexe/winPEAS/3rdParty/Watson/Watson.cs @@ -73,6 +73,7 @@ namespace winPEAS._3rdParty.Watson CVE_2020_0668.Check(vulnerabilities, buildNumber, installedKBs); CVE_2020_0683.Check(vulnerabilities, buildNumber, installedKBs); CVE_2020_1013.Check(vulnerabilities, buildNumber, installedKBs); + CVE_2020_0796.Check(vulnerabilities, buildNumber, installedKBs); // Print the results vulnerabilities.ShowResults(); diff --git a/winPEAS/winPEASexe/winPEAS/winPEAS.csproj b/winPEAS/winPEASexe/winPEAS/winPEAS.csproj index c9569ad..25893bd 100755 --- a/winPEAS/winPEASexe/winPEAS/winPEAS.csproj +++ b/winPEAS/winPEASexe/winPEAS/winPEAS.csproj @@ -639,6 +639,7 @@ +