+Version check fix

Changed version check to be of type "System.Version". This fixes:
https://github.com/PowerShellMafia/PowerSploit/issues/163
This commit is contained in:
b33f 2017-08-09 21:15:34 +01:00 committed by GitHub
parent b038f09ceb
commit 1950a169e3
1 changed files with 3 additions and 5 deletions

View File

@ -28,8 +28,6 @@ Only web credentials can be displayed in cleartext.
[CmdletBinding()] Param() [CmdletBinding()] Param()
$OSVersion = [Environment]::OSVersion.Version $OSVersion = [Environment]::OSVersion.Version
$OSMajor = $OSVersion.Major
$OSMinor = $OSVersion.Minor
#region P/Invoke declarations for vaultcli.dll #region P/Invoke declarations for vaultcli.dll
$DynAssembly = New-Object System.Reflection.AssemblyName('VaultUtil') $DynAssembly = New-Object System.Reflection.AssemblyName('VaultUtil')
@ -79,7 +77,7 @@ Only web credentials can be displayed in cleartext.
$null = $TypeBuilder.DefineField('pResourceElement', [IntPtr], 'Public') $null = $TypeBuilder.DefineField('pResourceElement', [IntPtr], 'Public')
$null = $TypeBuilder.DefineField('pIdentityElement', [IntPtr], 'Public') $null = $TypeBuilder.DefineField('pIdentityElement', [IntPtr], 'Public')
$null = $TypeBuilder.DefineField('pAuthenticatorElement', [IntPtr], 'Public') $null = $TypeBuilder.DefineField('pAuthenticatorElement', [IntPtr], 'Public')
if ($OSMajor -ge 6 -and $OSMinor -ge 2) if ($OSVersion -ge '6.2')
{ {
$null = $TypeBuilder.DefineField('pPackageSid', [IntPtr], 'Public') $null = $TypeBuilder.DefineField('pPackageSid', [IntPtr], 'Public')
} }
@ -149,7 +147,7 @@ Only web credentials can be displayed in cleartext.
[Runtime.InteropServices.CallingConvention]::Winapi, [Runtime.InteropServices.CallingConvention]::Winapi,
[Runtime.InteropServices.CharSet]::Auto) [Runtime.InteropServices.CharSet]::Auto)
if ($OSMajor -ge 6 -and $OSMinor -ge 2) if ($OSVersion -ge '6.2')
{ {
$PInvokeMethod = $TypeBuilder.DefinePInvokeMethod('VaultGetItem', $PInvokeMethod = $TypeBuilder.DefinePInvokeMethod('VaultGetItem',
'vaultcli.dll', 'vaultcli.dll',
@ -317,7 +315,7 @@ Only web credentials can be displayed in cleartext.
$PasswordVaultItem = [IntPtr]::Zero $PasswordVaultItem = [IntPtr]::Zero
if ($OSMajor -ge 6 -and $OSMinor -ge 2) if ($OSVersion -ge '6.2')
{ {
$Result = $Vaultcli::VaultGetItem($VaultHandle, $Result = $Vaultcli::VaultGetItem($VaultHandle,
[Ref] $CurrentItem.SchemaId, [Ref] $CurrentItem.SchemaId,