Merge pull request #68 from dbroeglin/fix/securestring-to-bstr

devblackops · web-flow · commit e3ec9fd99c8b · 2017-03-07T22:20:02.000-08:00
Fixing Add-NSCertKeyPair on PS v 6.0
diff --git a/NetScaler/Public/Add-NSCertKeyPair.ps1 b/NetScaler/Public/Add-NSCertKeyPair.ps1
@@ -104,8 +104,8 @@ function Add-NSCertKeyPair {
                     $params.Add('key', $KeyPath)
                 }
                 if (($CertKeyFormat -in 'PEM','PFX') -and $Password) {
-                    $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($Password)
-                    $unsecurePassword = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
+                    $creds = [System.Management.Automation.PSCredential]::new("dummy", $Password)
+                    $unsecurePassword = $creds.GetNetworkCredential().Password
                     $params.Add("passplain",$unsecurePassword)
                 }
                 $response = _InvokeNSRestApi  -Session $Session -Method POST -Type sslcertkey -Payload $params -Action add
@@ -114,4 +114,4 @@ function Add-NSCertKeyPair {
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,8 @@ function Add-NSCertKeyPair {`
`104`	`104`	`$params.Add('key', $KeyPath)`
`105`	`105`	`}`
`106`	`106`	`if (($CertKeyFormat -in 'PEM','PFX') -and $Password) {`
`107`		`- $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($Password)`
`108`		`- $unsecurePassword = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)`
	`107`	`+ $creds = [System.Management.Automation.PSCredential]::new("dummy", $Password)`
	`108`	`+ $unsecurePassword = $creds.GetNetworkCredential().Password`
`109`	`109`	`$params.Add("passplain",$unsecurePassword)`
`110`	`110`	`}`
`111`	`111`	`$response = _InvokeNSRestApi -Session $Session -Method POST -Type sslcertkey -Payload $params -Action add`
`@@ -114,4 +114,4 @@ function Add-NSCertKeyPair {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
`117`		`-}`
	`117`	`+}`