From 6fce8d6a8c0899ef07f1d81d1553be306fb5b16f Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 20 Sep 2022 11:58:29 +0200 Subject: [PATCH 1/3] Updates libressl files (#71) #### :book: Summary - adds missing `vendor` files into build package. - adds missing `openssl.conf` in build package. - updates libressl / openssl to v3.5.3 #### :bookmark_tabs: Test Plan > :bulb: Select your test plan for the code changes. - [x] Tested via Drone.io pipeline - [ ] Custom test - [ ] No test plan ##### Details / Justification #### :books: Additional Notes - :zap: See `v1.1.0-dev9` build - https://gitea.ocram85.com/OCram85/PSCredentialStore/releases/tag/v1.1.0-dev9 Co-authored-by: OCram85 Reviewed-on: https://gitea.ocram85.com/OCram85/PSCredentialStore/pulls/71 --- .drone.yml | 2 +- .gitattributes | 1 + src/Certificate/New-CSCertificate.ps1 | 2 +- src/Vendor/{libressl255 => libressl}/LICENSE | 0 src/Vendor/libressl/openssl.exe | 3 +++ src/Vendor/libressl255/libcrypto-41.dll | 3 --- src/Vendor/libressl255/libcrypto-41.exp | 3 --- src/Vendor/libressl255/libcrypto-41.lib | 3 --- src/Vendor/libressl255/libcrypto-41.pdb | 3 --- src/Vendor/libressl255/libssl-43.dll | 3 --- src/Vendor/libressl255/libssl-43.exp | 3 --- src/Vendor/libressl255/libssl-43.lib | 3 --- src/Vendor/libressl255/libssl-43.pdb | 3 --- src/Vendor/libressl255/libtls-15.dll | 3 --- src/Vendor/libressl255/libtls-15.exp | 3 --- src/Vendor/libressl255/libtls-15.lib | 3 --- src/Vendor/libressl255/libtls-15.pdb | 3 --- src/Vendor/libressl255/ocspcheck.exe | 3 --- src/Vendor/libressl255/openssl.exe | 3 --- 19 files changed, 6 insertions(+), 44 deletions(-) rename src/Vendor/{libressl255 => libressl}/LICENSE (100%) create mode 100644 src/Vendor/libressl/openssl.exe delete mode 100644 src/Vendor/libressl255/libcrypto-41.dll delete mode 100644 src/Vendor/libressl255/libcrypto-41.exp delete mode 100644 src/Vendor/libressl255/libcrypto-41.lib delete mode 100644 src/Vendor/libressl255/libcrypto-41.pdb delete mode 100644 src/Vendor/libressl255/libssl-43.dll delete mode 100644 src/Vendor/libressl255/libssl-43.exp delete mode 100644 src/Vendor/libressl255/libssl-43.lib delete mode 100644 src/Vendor/libressl255/libssl-43.pdb delete mode 100644 src/Vendor/libressl255/libtls-15.dll delete mode 100644 src/Vendor/libressl255/libtls-15.exp delete mode 100644 src/Vendor/libressl255/libtls-15.lib delete mode 100644 src/Vendor/libressl255/libtls-15.pdb delete mode 100644 src/Vendor/libressl255/ocspcheck.exe delete mode 100644 src/Vendor/libressl255/openssl.exe diff --git a/.drone.yml b/.drone.yml index ed9649a..a12591e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -120,7 +120,7 @@ steps: Install-Module -Name 'DroneHelper' -Repository 'PSGallery' -ErrorAction 'Stop' -AllowPrerelease -Force; Import-Module -Name 'DroneHelper' -ErrorAction 'Stop'; Install-ModuleDependency; - New-BuildPackage -Verbose + New-BuildPackage -Verbose -AdditionalPath @('./src/Vendor', './src/openssl.conf') }" - name: GiteaRelease diff --git a/.gitattributes b/.gitattributes index 48c4df2..0475b8c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,4 +21,5 @@ # Vendor resources config src/Vendor/libressl255/* filter=lfs diff=lfs merge=lfs -text +src/Vendor/libressl/* filter=lfs diff=lfs merge=lfs -text *.pfx filter=lfs diff=lfs merge=lfs -text diff --git a/src/Certificate/New-CSCertificate.ps1 b/src/Certificate/New-CSCertificate.ps1 index 7cb2ef1..3946224 100644 --- a/src/Certificate/New-CSCertificate.ps1 +++ b/src/Certificate/New-CSCertificate.ps1 @@ -66,7 +66,7 @@ function New-CSCertificate { ($PSVersionTable.PSEdition -eq 'Desktop' -and $PSVersionTable.PSVersion.Major -lt 6) -or ($IsWindows -eq $true) ) { - $openssl = Join-Path -Path $ModuleBase -ChildPath '/Vendor/libressl255/openssl.exe' + $openssl = Join-Path -Path $ModuleBase -ChildPath '/Vendor/libressl/openssl.exe' } $Env:OPENSSL_CONF = Join-Path $ModuleBase -ChildPath '/openssl.conf' diff --git a/src/Vendor/libressl255/LICENSE b/src/Vendor/libressl/LICENSE similarity index 100% rename from src/Vendor/libressl255/LICENSE rename to src/Vendor/libressl/LICENSE diff --git a/src/Vendor/libressl/openssl.exe b/src/Vendor/libressl/openssl.exe new file mode 100644 index 0000000..6c41afc --- /dev/null +++ b/src/Vendor/libressl/openssl.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2e072bbee7cc9e424bcaf24256527ba9742ae1e5ac3c570bf29ff9f76f8b86c +size 2000384 diff --git a/src/Vendor/libressl255/libcrypto-41.dll b/src/Vendor/libressl255/libcrypto-41.dll deleted file mode 100644 index 37c3f23..0000000 --- a/src/Vendor/libressl255/libcrypto-41.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58e99e5f73c9722c4c4e23743e533d777bff3337c486d9a945e9aff022125e46 -size 1462912 diff --git a/src/Vendor/libressl255/libcrypto-41.exp b/src/Vendor/libressl255/libcrypto-41.exp deleted file mode 100644 index a70887e..0000000 --- a/src/Vendor/libressl255/libcrypto-41.exp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa14db9365f3e6f30f0bf085e7b33bfd150db6936ec93e481a1d7558436a18a4 -size 454746 diff --git a/src/Vendor/libressl255/libcrypto-41.lib b/src/Vendor/libressl255/libcrypto-41.lib deleted file mode 100644 index b02b3a6..0000000 --- a/src/Vendor/libressl255/libcrypto-41.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c10a4dee83698de9a445b6b5572bc3f2d21d322e223c1812c3726f675e31951f -size 767528 diff --git a/src/Vendor/libressl255/libcrypto-41.pdb b/src/Vendor/libressl255/libcrypto-41.pdb deleted file mode 100644 index b7e1764..0000000 --- a/src/Vendor/libressl255/libcrypto-41.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3193e446fa1c9d8fed5a1d13a7faeccdb2459121ab1723493b34c91caf56c254 -size 1952768 diff --git a/src/Vendor/libressl255/libssl-43.dll b/src/Vendor/libressl255/libssl-43.dll deleted file mode 100644 index 35b13d7..0000000 --- a/src/Vendor/libressl255/libssl-43.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5785c6c95cf6e5a26389f29cbd1a83702209b0d0cf405ed79eb86966775bd7d8 -size 312957 diff --git a/src/Vendor/libressl255/libssl-43.exp b/src/Vendor/libressl255/libssl-43.exp deleted file mode 100644 index 2dacec3..0000000 --- a/src/Vendor/libressl255/libssl-43.exp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64440d35b269efdce0bda183b02d5384cb86e3c8757d3688d09b07ce85d80121 -size 36738 diff --git a/src/Vendor/libressl255/libssl-43.lib b/src/Vendor/libressl255/libssl-43.lib deleted file mode 100644 index 465779b..0000000 --- a/src/Vendor/libressl255/libssl-43.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3620a8e6fa138187b9a29b598174c02a9d14c54978c41c871a9ac9791d88b08 -size 61638 diff --git a/src/Vendor/libressl255/libssl-43.pdb b/src/Vendor/libressl255/libssl-43.pdb deleted file mode 100644 index 7439a7e..0000000 --- a/src/Vendor/libressl255/libssl-43.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bc96773c21403aa5feae4db58db92d91d93cd3ebc88bc2ff222a1c1ff26c569 -size 388096 diff --git a/src/Vendor/libressl255/libtls-15.dll b/src/Vendor/libressl255/libtls-15.dll deleted file mode 100644 index 077e694..0000000 --- a/src/Vendor/libressl255/libtls-15.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0a5ba84d5eb2d7b3a058fd68be411f936ee855748a5e66938b8810b99d96d70 -size 75901 diff --git a/src/Vendor/libressl255/libtls-15.exp b/src/Vendor/libressl255/libtls-15.exp deleted file mode 100644 index 2d1f17f..0000000 --- a/src/Vendor/libressl255/libtls-15.exp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f69c7b2bbe5f268cc2d572dd627d6c23081de6d8152dfff4c13c15b303d84a1 -size 11905 diff --git a/src/Vendor/libressl255/libtls-15.lib b/src/Vendor/libressl255/libtls-15.lib deleted file mode 100644 index f77188e..0000000 --- a/src/Vendor/libressl255/libtls-15.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93d30dc5ca2f3f102ee530f306139cca5b392afebc8fa65c054ae17884bb964c -size 20352 diff --git a/src/Vendor/libressl255/libtls-15.pdb b/src/Vendor/libressl255/libtls-15.pdb deleted file mode 100644 index d73e345..0000000 --- a/src/Vendor/libressl255/libtls-15.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c404a8c410624e8444078eabb913f52e3aadbac6d103f7eb5828f9bea1954219 -size 166912 diff --git a/src/Vendor/libressl255/ocspcheck.exe b/src/Vendor/libressl255/ocspcheck.exe deleted file mode 100644 index 417ab92..0000000 --- a/src/Vendor/libressl255/ocspcheck.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a69805aee7ee6cb71cf057504c4947b75c6fec935166271a05aa323a594960c0 -size 578870 diff --git a/src/Vendor/libressl255/openssl.exe b/src/Vendor/libressl255/openssl.exe deleted file mode 100644 index d63d3bf..0000000 --- a/src/Vendor/libressl255/openssl.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45576fd9f2903fd02cba75d1888d2ced7deab77e8a2e2c3dd05db2d87c81d3a1 -size 2271428 From 3d4f53ddc7136d6baec204ad55606e5e34922cff Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 20 Sep 2022 15:01:05 +0200 Subject: [PATCH 2/3] adds pinguinfuss contributed fix (#73) #### :book: Summary - redo PR from @pinguinfuss - fix error message - fix string quotation #### :bookmark_tabs: Test Plan > :bulb: Select your test plan for the code changes. - [x] Tested via Drone.io pipeline - [ ] Custom test - [ ] No test plan ##### Details / Justification #### :books: Additional Notes - just redo #72. - there was an issue caused by git config `core.autocrl` displaying / diffin the wrong line ending sequence Co-authored-by: OCram85 Reviewed-on: https://gitea.ocram85.com/OCram85/PSCredentialStore/pulls/73 --- src/Item/New-CredentialStoreItem.Tests.ps1 | 2 +- src/Item/New-CredentialStoreItem.ps1 | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Item/New-CredentialStoreItem.Tests.ps1 b/src/Item/New-CredentialStoreItem.Tests.ps1 index 4bc582e..fcbc336 100644 --- a/src/Item/New-CredentialStoreItem.Tests.ps1 +++ b/src/Item/New-CredentialStoreItem.Tests.ps1 @@ -102,7 +102,7 @@ Describe "New-CredentialStoreItem" { It "Missing CredentialStore should throw" { { New-CredentialStoreItem -Shared -Path '/tmp/missingStore.json' -RemoteHost 'notrelevant' - } | Should -Throw "Could not add anything into the given CredentialStore." + } | Should -Throw "The given credential store (/tmp/missingStore.json) does not exist!" } } Context "Testing pipeline paramter" { diff --git a/src/Item/New-CredentialStoreItem.ps1 b/src/Item/New-CredentialStoreItem.ps1 index 957897a..6e159cb 100644 --- a/src/Item/New-CredentialStoreItem.ps1 +++ b/src/Item/New-CredentialStoreItem.ps1 @@ -32,7 +32,7 @@ function New-CredentialStoreItem { [None] .EXAMPLE - New-CredentialStoreItem -Path "C:\TMP\mystore.json" -RemoteHost "esx01.myside.local" + New-CredentialStoreItem -Path 'C:\TMP\mystore.json' -RemoteHost esx01.myside.local' #> [CmdletBinding(DefaultParameterSetName = 'Private')] @@ -68,7 +68,7 @@ function New-CredentialStoreItem { begin { # Set the CredentialStore for private, shared or custom mode. - Write-Debug ("ParameterSetName: {0}" -f $PSCmdlet.ParameterSetName) + Write-Debug ('ParameterSetName: {0}' -f $PSCmdlet.ParameterSetName) if ($PSCmdlet.ParameterSetName -eq 'Private') { $Path = Get-DefaultCredentialStorePath } @@ -84,9 +84,9 @@ function New-CredentialStoreItem { if (-not(Test-CredentialStore -Shared -Path $Path)) { $MessageParams = @{ Exception = [System.IO.FileNotFoundException]::new( - 'Could not add anything into the given CredentialStore.' + 'The given credential store ({0}) does not exist!' -f $Path ) - ErrorAction = "Stop" + ErrorAction = 'Stop' } Write-Error @MessageParams } @@ -95,8 +95,8 @@ function New-CredentialStoreItem { $CurrentDate = Get-Date -Format 'u' - if ($Identifier -ne "") { - $CredentialName = $RemoteHost = "{0}/{1}" -f $Identifier, $RemoteHost + if ($Identifier -ne '') { + $CredentialName = $RemoteHost = '{0}/{1}' -f $Identifier, $RemoteHost } else { $CredentialName = $RemoteHost From ac6a9d8202612f217cb787e3543f9f733b822096 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Wed, 21 Sep 2022 09:39:56 +0200 Subject: [PATCH 3/3] prepare release 1.1.0 (#74) #### :book: Summary - updates changelog #### :bookmark_tabs: Test Plan > :bulb: Select your test plan for the code changes. - [x] Tested via Drone.io pipeline - [ ] Custom test - [ ] No test plan ##### Details / Justification #### :books: Additional Notes Co-authored-by: OCram85 Reviewed-on: https://gitea.ocram85.com/OCram85/PSCredentialStore/pulls/74 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7283a11..7f06af3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,9 @@ ## `v1.1.0` -- (acb09ba) update Changelog +- (3d4f53d) adds pinguinfuss contributed fix (#73) +- (6fce8d6) Updates libressl files (#71) +- (ddb85d9) addChangelog (#70) - (5bdb383) updates Readme (#69) - (a95ba31) remove optional depenency helper (#68) - (1e7dd78) adds CiscoUCSCentral connection type (#67) @@ -20,7 +22,6 @@ - (4abfec5) adds PR template (#55) - (7708df9) Update pwsh style to latest community standards (#52) - ## `v1.0.542` - 🧙 pre migrated Gitea version