revert 206b3bf and 69a009d

Author: RadNotRed

.github/workflows/apbx.yaml

@@ -71,32 +71,18 @@ jobs:
         working-directory: ..
         if: env.runSxsc == 'true'
 
-      - name: Generate and trust signing certificate
-        id: cert
-        run: |
-          $thumbprint = .\make-cert.ps1
-          Write-Output "thumbprint=$thumbprint" >> $env:GITHUB_OUTPUT
-
-          Write-Output "Importing generated cert to trusted root..."
-          Import-Certificate -FilePath ".\sxs.cer" -CertStoreLocation "Cert:\LocalMachine\Root" | Out-Null
-        shell: pwsh
-        working-directory: ..\sxsc
-        if: env.runSxsc == 'true'
-
       - name: Build CAB
         run: |
           Write-Output "Installing dependencies..."
           pip install -r requirements.txt | Out-Null
 
-          $thumbprint = '${{ steps.cert.outputs.thumbprint }}'
-          Write-Output "Using cert thumbprint: $thumbprint"
+          Write-Output "Making certificate..."
+          $thumbprint = .\make-cert.ps1
 
           $atlasSrcPath = '..\Atlas\src\'
           $packagePath = "$atlasSrcPath\playbook\Executables\AtlasModules\Packages"
           mkdir $packagePath -EA 0 | Out-Null
 
-          Copy-Item -Path ".\sxs.cer" -Destination $packagePath -Force
-
           Get-ChildItem "configs" -Filter *.yaml | ForEach-Object {
               Write-Output "`n`nProcessing $($_.Name)`n------------------------------------------------------"
               Copy-Item -Path $_.FullName -Destination "cfg.yaml" -Force | Out-Null

src/playbook/Configuration/atlas/components.yml

@@ -3,14 +3,6 @@ title: Components
 description: Removes certain Windows components
 onUpgrade: false
 actions:
-  # Trust certificate so CAB signatures are valid
-  - !powerShell:
-    command: >-
-      Import-Certificate -FilePath "$([Environment]::GetFolderPath('Windows'))\AtlasModules\Packages\sxs.cer"
-      -CertStoreLocation "Cert:\LocalMachine\Root"
-    wait: true
-    exeDir: false
-
     # Remove Security Center startup item
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run', value: 'SecurityHealth', operation: delete}