Skip to content

Commit

Permalink
Revert "Changed all lines as discussed under PR 43 and issue 42"
Browse files Browse the repository at this point in the history
This reverts commit 230fce4.
  • Loading branch information
svenvanrijen committed Mar 2, 2017
1 parent 8f402ac commit 97ca5c6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
6 changes: 3 additions & 3 deletions DSCResources/MSFT_xCertReq/MSFT_xCertReq.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,8 @@ RenewalCert = $Thumbprint
$certReqOutPath = [System.IO.Path]::ChangeExtension($workingPath,'.out')
$command = "$PSHOME\PowerShell.exe"
$arguments = "-Command ""& $ENV:SystemRoot\system32\certreq.exe" + `
" @('-submit','-q','-config','$ca','$reqPath','$cerPath')" + `
" | Set-Content -Path '$certReqOutPath'"""
" @('-submit','-q','-config',$ca,'$reqPath','$cerPath')" + `
" | Set-Content -Path '$certReqOutPath'"""

# This may output a win32-process object, but it often does not because of
# a timing issue in PDT (the process has often completed before the
Expand All @@ -421,7 +421,7 @@ RenewalCert = $Thumbprint
$($LocalizedData.SubmittingRequestProcessCertificateMessage)
) -join '' )

$null = Wait-Win32ProcessStop `
$null = Wait-Win32ProcessEnd `
-Path $command `
-Arguments $arguments `
-Credential $Credential
Expand Down
7 changes: 0 additions & 7 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,6 @@ Please check out common DSC Resources [contributing guidelines](https://github.c

### Unreleased

- xCertReq:
- Fixing issue #42 (Error when requesting cerificate using $credential and error regarding single quotes around the $ca variable value):
- Removed single quotes in three lines (131, 281 and 592) around the $ca variable value.
- Added single quotes around the $ca variable in line 408 when requesting the certificate.
- Changed function WaitProcessEnd to function WaitProcessStop (line 424).
- Changed line 22 of the integration test (`Exportable = $($Exportable.ToString().ToUpper())` to `Exportable = $Exportable`), so the manual integration tests work.

### 2.3.0.0

- xCertReq:
Expand Down
2 changes: 1 addition & 1 deletion Tests/Integration/MSFT_xCertReq.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $TestCertReq = [PSObject]@{
CARootName = $CARootName
Credential = $Credential
KeyLength = $KeyLength
Exportable = $Exportable
Exportable = $($Exportable.ToString().ToUpper())
ProviderName = $ProviderName
OID = $OID
KeyUsage = $KeyUsage
Expand Down

0 comments on commit 97ca5c6

Please sign in to comment.