diff --git a/winPEAS/winPEASexe/winPEAS/App.config b/winPEAS/winPEASexe/winPEAS/App.config old mode 100755 new mode 100644 index 2177a05..1548729 --- a/winPEAS/winPEASexe/winPEAS/App.config +++ b/winPEAS/winPEASexe/winPEAS/App.config @@ -14,6 +14,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/winPEAS/winPEASexe/winPEAS/Info/CloudInfo/GWorkspaceInfo.cs b/winPEAS/winPEASexe/winPEAS/Info/CloudInfo/GWorkspaceInfo.cs index 7d1579c..5ba2e85 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/CloudInfo/GWorkspaceInfo.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/CloudInfo/GWorkspaceInfo.cs @@ -286,8 +286,10 @@ namespace winPEAS.Info.CloudInfo byte[] plaintext = new byte[gcm.GetOutputSize(actualCiphertext.Length)]; int len = gcm.ProcessBytes(actualCiphertext, 0, actualCiphertext.Length, plaintext, 0); - string plaintextString = Encoding.ASCII.GetString(plaintext, 0, len); - gcm.DoFinal(plaintext, len); + int len2 = gcm.DoFinal(plaintext, len); + + string plaintextString = Encoding.ASCII.GetString(plaintext, 0, len+len2-mac.Length); + return plaintextString; } diff --git a/winPEAS/winPEASexe/winPEAS/packages.config b/winPEAS/winPEASexe/winPEAS/packages.config index 5504070..1009216 100644 --- a/winPEAS/winPEASexe/winPEAS/packages.config +++ b/winPEAS/winPEASexe/winPEAS/packages.config @@ -33,7 +33,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/winPEAS/winPEASexe/winPEAS/winPEAS.csproj b/winPEAS/winPEASexe/winPEAS/winPEAS.csproj old mode 100755 new mode 100644 index bfb8d5f..2dcd1fd --- a/winPEAS/winPEASexe/winPEAS/winPEAS.csproj +++ b/winPEAS/winPEASexe/winPEAS/winPEAS.csproj @@ -217,9 +217,8 @@ ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll - True + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True @@ -284,9 +283,8 @@ ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll - True + + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll True