CHANGELOG.md

@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.0] - 2020-04-02
+
+### Summary
+Update `puppetlabs-inifile` dependency. Install task can download macOS 10.15.
+Windows FIPS. Pidlock, puppet.list config and root check fixes for
+`install_shell` task.
+
+### Features
+- Update inifile dependency to allow all 4.x versions ([#477](https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/477))
+- Allow install task to downlad macOS 10.15 ([#471](https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/471))
+
+### Bug fixes
+- Fix windowsfips upgrades ([MODULES-10606](https://tickets.puppetlabs.com/browse/MODULES-10606))
+- Remove pidlock if service states cannot be restored ([MODULES-10594](https://tickets.puppetlabs.com/browse/MODULES-10594))
+- Exit early when puppet.list config file has been modified ([MODULES-10589](https://tickets.puppetlabs.com/browse/MODULES-10589))
+- Check that user is root only if installation is required ([#475](https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/475))
+
 ## [3.0.2] - 2020-02-14
 
 ### Summary

files/install_puppet.ps1

@@ -249,8 +249,12 @@ function Script:Reset-PuppetServices {
       # service before upgrade, but no mcollective service after
       if (Get-Service $service.Name -ErrorAction SilentlyContinue) {
         Write-Log "Restoring service state for $($service.Name)"
-        Set-Service $service.Name -StartupType $service.StartType
-        Set-Service $service.Name -Status $service.Status
+        try {
+          Set-Service $service.Name -StartupType $service.StartType -ErrorAction Stop
+          Set-Service $service.Name -Status $service.Status -ErrorAction Stop
+        } catch {
+          Write-Log "Could not restore service state for $($service.Name). $_"
+        }
       } else {
         Write-Log "Get-Service failed to fetch $($service.Name), continuing..."
       }

manifests/osfamily/redhat.pp

@@ -16,17 +16,22 @@
         $platform_and_version = "fedora/${::operatingsystemmajrelease}"
       }
       'Amazon': {
-        $platform_and_version = 'el/6'
+        if ("${::operatingsystemmajrelease}" == '2') {
+          $amz_el_version = '7'
+        } else {
+          $amz_el_version = '6'
+        }
+        $platform_and_version = "el/${amz_el_version}"
       }
       default: {
         $platform_and_version = "el/${::operatingsystemmajrelease}"
       }
     }
     if ($::puppet_agent::is_pe and (!$::puppet_agent::use_alternate_sources)) {
       $pe_server_version = pe_build_version()
-      # Treat Amazon Linux just like Enterprise Linux 6
+      # Treat Amazon Linux just like Enterprise Linux
       $pe_repo_dir = ($::operatingsystem == 'Amazon') ? {
-        true    => "el-6-${::architecture}",
+        true    => "el-${amz_el_version}-${::architecture}",
         default =>  $::platform_tag,
       }
       if $::puppet_agent::source {

manifests/osfamily/windows.pp

@@ -9,8 +9,9 @@
     $pe_server_version = pe_build_version()
     $tag = $::puppet_agent::arch ? {
       'x64' => $::fips_enabled ? {
-          true => 'windowsfips-x64',
-          default => 'windows-x86_64' },
+        true => 'windowsfips-x86_64',
+        default => 'windows-x86_64'
+      },
       'x86' => 'windows-i386'
     }
     if $::puppet_agent::alternate_pe_source {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-puppet_agent",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "author": "puppetlabs",
   "summary": "Upgrades All-In-One Puppet Agents",
   "license": "Apache-2.0",
@@ -120,7 +120,7 @@
   ],
   "dependencies": [
     {"name":"puppetlabs-stdlib","version_requirement":">= 5.1.0 < 7.0.0"},
-    {"name":"puppetlabs-inifile","version_requirement":">= 2.4.0 <= 4.0.0"},
+    {"name":"puppetlabs-inifile","version_requirement":">= 2.4.0 < 5.0.0"},
     {"name":"puppetlabs-apt","version_requirement":">= 7.0.1 < 8.0.0"},
     {"name":"puppetlabs-facts","version_requirement":">= 0.5.0 < 1.0.0"}
   ]

spec/acceptance/files/ca_crt.pem

@@ -1,32 +1,63 @@
 -----BEGIN CERTIFICATE-----
-MIIFbTCCA1WgAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZQdXBw
-ZXQgQ0E6IHNvY2tzLmxvY2FsMB4XDTE1MDMwMjExNTYyMFoXDTIwMDMwMTExNTYy
-MFowITEfMB0GA1UEAwwWUHVwcGV0IENBOiBzb2Nrcy5sb2NhbDCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAL0qDiSB8u/6dxihgLSycKXGMeH+xzASvIWk
-tsK6oPZ8vwBeEoz4A1iw6Lf7Xz9G9qUx0NlmLryN7HLFmidQ4aTwgYE/+/Q/xwa1
-FJaFl9yy49vU8/rfZ6m6/xNfBMP3MzDjqtlDYouo1A7h+VTN9sXMmltI9Qu8zwvT
-0UYRy9J8wAMri7y0yVdiYZ4IjhzhwGaB4yrCZkFN6fsuoW3u2Yb1BtewffqXoav2
-R5G6m/tcgMzNkyJ9cG+GUM1bk5lEE8KOf360mHC8RsOu/7ZWLJmIUx5JKB+5xhGX
-1nNd71mNB36f6JJ5ZlNSdVa4Yw5bv2HPyqk3BXbxfZlov/8ECfyEsW4LIANgTQbm
-9Eep6wZE8inogDiGB5hMH1VgrbLjiNriScF3yeMVfdyzRdSp/OjyuE1CmOcBToIu
-Bse7RDfpuJNDQs9ycqaa1ncFVA0sO6e06FszlznaioejELjCULT6qxVNgwTLTPqH
-e1vTZe+iCtoVAIw0RFUhHltAZE4hUXAm+trgAy1FIpeG90TTtfHQEwpR9IgdzDaI
-b2Oc4WeOG7pYxBRFz9NeESyBuKxXmCVfbprbtunpP/F0N4TgUc2zxdSZFN03GKL+
-jKYYDUcFq4Iune/uxdGudcUHfyx0XaRFmRAjtqwFoFzuebnuJuXKcCuh7x5OTB8i
-4sF64VQJAgMBAAGjga8wgawwNQYJYIZIAYb4QgENBChQdXBwZXQgUnVieS9PcGVu
-U1NMIEludGVybmFsIENlcnRpZmljYXRlMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBRqr/VzStqL/9HXVt6Qy5P7nhV46zAzBgNVHSME
-LDAqoSWkIzAhMR8wHQYDVQQDDBZQdXBwZXQgQ0E6IHNvY2tzLmxvY2FsggEBMA0G
-CSqGSIb3DQEBCwUAA4ICAQAWW4sT+13YO3E76jLgjhIjOmmQCSGJiJAHe8gxZxrZ
-xbsybkImc+bR0DIJXMQzWpm183Wx0K3YKVD50zfoS5hTThU8OLuMHvXfmMwNy7Hi
-0vwOaREyrfIzuCRhY3PUz7HXlncdmzAT/1Q9n07d7VCmsFvHtksSJUVcTAMsL9xv
-D6fzO2or1ZtpJbckww6NmoOw+ofdn4vutn06do5SZbbPDfzEfdyPbeWFUXqFlCGk
-/IO8RWjMt6XRBfc6z9HFqj4HI2n5t8gSVN8MTUo1vmzaR0rErpO+JGw8xm2XVvBW
-jHwG8onTGErHYk+04M+woL8Q294SglpfvLONuJTBaKGaCtVnQvhDMvITJ7rnrBz3
-r1x1Fx635ofY+FGpVMX0EGLA79gaya6zeyBIlvtUcTN89UfQ0sCEClme9Oe48Scy
-bSJKsJNsNqEljCWQ8sqlc4zGXGk2tysAHWBEPoPcfPeIyWKNx0KQ5dz8zf+adV+3
-JIZC70qF3fEnyhpv0Z6B7VxRR/EZUVAyLIkucQUNVcMR7uTuAWv67CciCS9EOfit
-eYNnpfGRXYoiEgaSnv6oOCtgDSXd6nJgtfe9m4K7200KNPFJIWREFm21UCseHsRc
-AC+KbxNdwopBY8IFS2PLJQPQfBnf4q5uPZagBg4r0mHH5TgiESpa15fI25fjxAHB
-Zw==
+MIIFdzCCA1+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDDB5QdXBw
+ZXQgUm9vdCBDQTogOGYyOWI5ZDIyYTkwZGMwHhcNMjAwNDAyMTAwNDI3WhcNMzUw
+MzMxMTAwNDMyWjA7MTkwNwYDVQQDDDBQdXBwZXQgQ0E6IGlkbGUtbWVyY2hhbnQu
+ZGVsaXZlcnkucHVwcGV0bGFicy5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQCninUkz+aAXflY6u45jzg0ltZasPKKJUCNIxn4xKJSkSxZTVAb6eb7
+EXDSZnoNH4GJXQg81ihh2oUjNUWVy8DuibvDY8Mh4MzhBqTU6kJiEmfh2WgRftzt
+x8WqK7+0paVftbz9YSsYfUnnR/w+xVf4iOYDXy2Pxk3O9objrqNDMQqeiFFXN07M
+U1M2GGSNaCUQAsQ+suF64AdvS/F6MMDMudtPHBGSn/UMYP5ercMxZz9DXsk6l3j7
+O5rUsiId5JpXA/U+SzijWDQCFaexRK/dLbqhdmYQMP9v5PWr6KEwtlsOZmebtdqH
+KwV/FfiVOCUHyNff5tVdtJmQe08EimUOjHGPm41YHF6X536TNw/S6nzmK3X/+oaB
+SYx8igyc1gupVVUZO0OAo/Rc60XW/diLq7wz8zLHTPhbE8FUscHhyW1OYknJXtZe
+X1U3g6w3cx0NWXKJgWyvR9tkUk50tW1I5ReU5W9Hf/twwW0lAecUtA9Sx97UvOaR
+z90l+lrdS5dTYRX26yOl2aL3Phvr4leNKzmjb3o7jOh60fKtYtWzAS/UtPfBA9nb
+WL61SjwdNdaDcuKGwWKpNGg/kA+vdacyJ3qHFqTZn/ToHGalbetnLHJuQVGFP85s
+DcdboyxCQs1/qS22K7AmHFjhEPLplzwxpjDXWObtXOj8iQ2Yl/YIhQIDAQABo4GX
+MIGUMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT3
+l92ec99GwB9UYuo0cOmVFZOmazAxBglghkgBhvhCAQ0EJBYiUHVwcGV0IFNlcnZl
+ciBJbnRlcm5hbCBDZXJ0aWZpY2F0ZTAfBgNVHSMEGDAWgBQ165AQ9Hgy8gxo1Jf/
+QPr4FhgunzANBgkqhkiG9w0BAQsFAAOCAgEAi4RHriZAAdGhtTMMEGrlSgzbWnwg
+SolX4hrJsuoiOCv/HRxermOcOnMmCThFf1NxVRSqRNvLKQjH0T5KVUqHFB1j8k46
+x6btkwC/69JfMF6wxh3HTWQCkVSZbct2WmRYNBbHQrfoqfqjiQo7E5YLzuHksdz2
+W34iDiZAFjtZW5YvxMg0b8JzsRqe/Lk3b95UECxXskhiGuCH5YTfkoZjNFgj5bwd
+GMipNWO6XEbTtDBom2Fmke4bx5YgPbsjFLG1rptg2X8/ZIdKVT6/StlRZbzo76Nt
+/8fpsLqkp5IHZhCrEDy6UG9pcfNbBz52rsJzBxfPmeZ0AsgqAh0G0lQ3ODkbazt8
+tnLHFgNkjIHRfXufb0iLd2XV9rwj4+7lzWolraE4AJSZqw6W0n2Jjr+JEYBDSgIl
+r80NooKEjoALzc8wvutRxP8LDbGsrSNJNlfIQSj6rxnBKXrc9hyIsbFbceyEEeSd
+LuxorqBpVoh5Uo4WyUyetV3asCnjJvo3HNF2/D9ubKj9abL1TbtUd8a0BllytOdr
+ZU3Nt9mZpPZEgyeb0RzoIaTHIYzQVbJC506polJ+5MUvO144eU+JRb3b7kQVJuRO
+1O0ZsVUVTWkKxC1MsHSADjqKj0vVFIsdmU8qhUXsI+usl4Mzt7iKnY7uWIel+Cdn
+5guAP0wvZktJUPw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFZTCCA02gAwIBAgIBATANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDDB5QdXBw
+ZXQgUm9vdCBDQTogOGYyOWI5ZDIyYTkwZGMwHhcNMjAwNDAyMTAwNDI3WhcNMzUw
+MzMxMTAwNDMwWjApMScwJQYDVQQDDB5QdXBwZXQgUm9vdCBDQTogOGYyOWI5ZDIy
+YTkwZGMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDy3M4njNOKfNXw
+uQKzU4y+ghJt8MLqLUfOAjb9XVWeQv1ZmcmA5VIu+TQeq0d8MAzWXuFnhq9d90M9
+iXe/bik94wPEfxT9g1dyBX+QzMsEL0VWmqWfuoy3WlqehdHzRiVDsp9XBT/5PhgH
+T753J9zqxmdP+Vl1wa3iiy8SI9i5BiqYuGzRya10fW58P8QJR9MsFUK/gGdo7J4Z
+RhpYsYt+cfCozecxjyXVniwoQow8axI7SA912Moql6pUFKyPXEwlHacwTQp/dU3r
+q7HEKh+Ymyp2jDIInawmIe91lDjeYo3zxmDHMBfcishG2Ab0FAo+bHJC9hGMiOlJ
+KlOUTDZfP0ciLGFbl+bvIYoWpxUbCjSKpsJ++F27BWJBimE0BeZThzjRa6uXaqBM
+xaxgqBdavxWnqfc4oK/DBU9mY3p+pHejH+4/y2eRmxFbpGuiPU7EcowGfgTFX5Uo
+Ny1KWuo9nGr2tu9NBwvFBA6L00oxwt8JqqKxeYf8X0fSX/5B4sRT4ufR+y2fvJvV
++8w9kOqI3Uaqt+mMzEbVkicOBNJrfI/zpyOeXxgJPjbjUKZ+L5Hb8uSqs5e1p+oY
+asL5uHTdqLyrJC2TuvpF4hV8Z2gmQQtiWoeptLeu7zBF+54eoTmeP3CphMbz+TIi
+5f46sDzbedTKoaKNco/hjBB1BlLsfwIDAQABo4GXMIGUMA8GA1UdEwEB/wQFMAMB
+Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQ165AQ9Hgy8gxo1Jf/QPr4Fhgu
+nzAxBglghkgBhvhCAQ0EJBYiUHVwcGV0IFNlcnZlciBJbnRlcm5hbCBDZXJ0aWZp
+Y2F0ZTAfBgNVHSMEGDAWgBQ165AQ9Hgy8gxo1Jf/QPr4FhgunzANBgkqhkiG9w0B
+AQsFAAOCAgEAo5bW0PPHxZCpP1WYskh0/Ia1qnr6cEq/jg4Hh2nYwg6tTwEk+SxP
+eCrrNPZQ7j33/Yi4UmxKn8aB3WAjDAOy77AtNvRUdwWczQPThlPMSJFehIUg+Eq5
+oob9Q8f1zArYisVoUXJRz2vxs2sbvS7Gy3CVxF4nsuBuxac6rBb5CHok+cfDwhnH
+GuR5w2zSDKU/GXXro/3eLd/MnC41Wlu0BB0oI65YaOs93S8e2F0btiHMkXEe+/E8
+twRF15QA5p4Ph+L/pzPIqpZwVtR3jMga8IVjmDBmG+j90cXlILlz55v6xlt6+9Cu
+h1KoOpa46r8NHl3W4kVm65wAcr63GvO+m3PlLSd1zRpWXG50YOq/ElxcuF+1fJoQ
+nGRiC6+ukdI5maT2H9AkVMqo/EZKvMCXDtuPP4GfgGO/nSBC3zPxcd0qHpRYM5yL
+k2oBIkAQbeDiTUOFcJTGiwGP+nlufhsp7+OSMjP84LpoQJ3ajKyG+XJ4xg+I8d5B
+YWoXj+zq0w7Laij37L5XGqOC7LigD+Aag/nRi80Cho45w2UCDRGZGi52XmE2cG95
+Hnym3GS7nDcUBS4a57Pvc4NuWDVCReYG+4WEvZ8HrfDkDhE8+gm4MIV4dqkDW73s
+XvJfNHgpCT2QytReqLTgFI2bv979kCkbbWThpy8Dnx/NGV3edYZO+zU=
 -----END CERTIFICATE-----

spec/acceptance/files/client.crt

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIBBDANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZQdXBw
-ZXQgQ0E6IHNvY2tzLmxvY2FsMB4XDTE1MDMwMjExNTYyOVoXDTIwMDMwMTExNTYy
-OVowHTEbMBkGA1UEAwwSbWNvbGxlY3RpdmUtY2xpZW50MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAopc/qeMD7V4sQSeLjI71Na9gabTXC5dxDV5T/qoM
-ZOGVInuMUVEjWWYM/Pjsj+/rEqjcN+0N8sZHpY9sMkbqB97I9c0A/zdVskF8EGVe
-7vS/ytUIUtKwONffD0/FEPNpIDUc++rSj5PPgJvn35ObhB7Q2MpXLx6iamD1gnyF
-fmrssnv6/f5esjV/n61YaskLd1zQD6t7Zghdkzjy6pFz/AfGqWdzq4r2D5ANnsTO
-WAH1qWyphv8Jbwf7vE+H8x7jySmwrxmHu/PDiqZMz28ZRTVjWBWY67hI7Z/p1otQ
-kzoFFf7XLNfNuyajcsG1YCaGXwbBHdb5aa+leLKLzPd1Xy1X0/h4MEG63xFzkrml
-B7PQZHbzVHdi1lI4tI6erUyb3RjsIT2EE8ED732iDIPZduDg5I1yOUKa7R8wEYVE
-RyHv7V6Hbo2ydJu/oIMwJZ0oGlzK1T1xpEsg8t7wgcLKUY7n/+zG23dLOh49/ubm
-+ecC3QbN1z3pMc9pOceTwkWCi6vGf0Otd1TrraHAlK22dzkfQqFK2mKMegoQZXSW
-HPd5JAdSy4qnXCJPxGJaStQGDii5SndFWiuduKlQpSE6WSgMdiBwncAFmdYsnlNM
-gY0wHL/ufjWhsVdePVrEagNux6PdLdmolWawoHxtNh4UuwyByiyJU8gF7A6f/DoA
-H8cCAwEAAaOBujCBtzA1BglghkgBhvhCAQ0EKFB1cHBldCBSdWJ5L09wZW5TU0wg
-SW50ZXJuYWwgQ2VydGlmaWNhdGUwDgYDVR0PAQH/BAQDAgWgMCAGA1UdJQEB/wQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQV
-Bygt19XIerwYMgLimQ1LAQjwATAfBgNVHSMEGDAWgBRqr/VzStqL/9HXVt6Qy5P7
-nhV46zANBgkqhkiG9w0BAQsFAAOCAgEANw3dHIu3J71utQB8eiCwfhNKxBhM8Yj3
-i+eeAvyo28ZN3knyCbXRQmaegVRbeRLHi3YC+9yG0MFTBeOasxVPK508WosaaQJA
-yOuP/++IYbPiqB/xZArAbe5lA/bmp7xekS/hB9PA0hp6eS2tj13GQBOfJ+tNDEFf
-su8H1w+OIA626LfR1PwaqkKCTQBHEtX+Cv8KyvDeYLt0cP2tMi4MQbqdqO093AHO
-4o8ZdyBOJUwzjYzt+4Y3M5Lh7i/WXh4XxnH59F0RfhVmztf2cSrjRKUvop+IDP7b
-b1bx4vtnorFSFqcngb9jg6Om21+x1Akhew26ZsvlazSWwAxCrlPOSCPy/taW680K
-gA02sbAonkanLe44E3UE5puugWz8ImDp28gOGt1PWiCyNxtJcJ3j3OTw/L5jur8Q
-OEZNhTrZ5j7WdZrzEFMiu6K7C2c0RL2Gz1TWd4MocGTe/vs+0ebbh6D1w9EGci8V
-+FBIavrOc9ZmI03wGIHLnHD+QgxLeTvQOnFENr0k9ah320b8UHdpbbvr3pRf8an5
-Q8GdVahd5gTY1CbkZGeaIlY8OWUG7s9mvGGDEswSsLIah0UjTNDpzexw1ibr+LDZ
-tSH7GPdtwSniix47ywtv/qzVa8erCpJQ6rucUThR7o4jn3BcZJm0ZDGzZhWhpxjt
-cCoGKqzr1xk=
+MIIFijCCA3KgAwIBAgIBBDANBgkqhkiG9w0BAQsFADA7MTkwNwYDVQQDDDBQdXBw
+ZXQgQ0E6IGlkbGUtbWVyY2hhbnQuZGVsaXZlcnkucHVwcGV0bGFicy5uZXQwHhcN
+MjAwNDAyMTExOTAyWhcNMjUwNDAyMTExOTAyWjAdMRswGQYDVQQDDBJtY29sbGVj
+dGl2ZS1jbGllbnQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDEHGR6
+9uhaX50JguP6A9IkVyuAYo049PENwcsRK5T1BQHQzkAanMQR+aYH9IT3K5/B84DA
+qx0bjOdI5lbNJnKKuZpoqTZzS5mcD3hp+ddZV1OSb+/3n1l8VZ00c1dwRE/UYU/1
+KGJpH2tJPk0Md1y8czk1wJtYOapmRHr97mySD9ruLzuDYrFIt+jQSZtrBTPCJN19
+ymbo2LipauUtbs9+RmTl75fMKSg39BHf62F4Z5jblqoL2m3/dHogZ6hQdfFMNzSx
+YvOjSk8aVHQl3NqlZ4ZRbNIoVe8KSNBqQ8gy5Tyw3+SJRWMRFDllDgzY2Xzl/HKg
+jGKRdp1/wkGpgCYxj6ANMIxJOUWBkE+alut93piqDk0yvEjS1OzKwCnu9mNiP1pU
+hCJUbYpKk9DIZejop9lc1WiK1slNwirwpzE7n1xJxDo7V60yNEWTFK6Fc0YSrLS0
+6xv9bYH0CAbhfcQAPVs8E32Fh+93/YM9ghxi4NVBOGTsuqH+MI/ZNUrMyYHuOsks
+nrvA5wc/q1dNOVpYTWhuroQ6Kni4ViizXcghJ9Sk5Gboitc7w3MyXaiLdCPtt0+p
+sn9soZhuc4q1222S/qXD6TKk7wnLAdDRC/EhokzhrmPsNTWHOT2Gfqw4M53jbsuF
+qVbqJfR3t5NSVkyQ6JqWTVLPevdsj43RZRLkwQIDAQABo4G2MIGzMDEGCWCGSAGG
++EIBDQQkFiJQdXBwZXQgU2VydmVyIEludGVybmFsIENlcnRpZmljYXRlMB8GA1Ud
+IwQYMBaAFPeX3Z5z30bAH1Ri6jRw6ZUVk6ZrMB0GA1UdDgQWBBTGiU0W7wPEc9SK
+p1hV7GJVu6RRRjAMBgNVHRMBAf8EAjAAMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwDQYJKoZIhvcNAQELBQADggIBAFVJ
+iRrtrYmi237CbjFHP7KgKWHgVsuydvDAnfXTwqIc6qqfcgLOM0cHyWmwAnmAae3m
+DRL169VkD+TuaNnArM+QrhqRMFWND9cFNGv0BOKTM24FNblUqNL/PIqRLi3dFnrJ
+86gakSywgm1wBQCV8qNTO6z2QHaKE3EhssbJiD5Dfklx1RM63VDSVN9z0o2/nWs1
+cChaXsSJmocWPAf9rYpEW1459e9x0v1x9jiB15qqEsLMuwagVmmm5WzWJ3CZhbhw
+KbjsCqOl0YNcPXhmxH1SbHYKd5t6qEslc2JzE9RoHXB2/ZsaDQV9for/OWvHnBXM
+BcXksmAQg52K6Ug5R444zI8//MQqGIbCfG7as6iccjU4SYeSbzRSuqng/2sfR8Vf
+7bI7tr9Z0yYg7KaYu9CMlh4HnJsbhv76vx5lES872PscGvpJvfjVEE8c7V7yqCaW
+E2mN4OizQRA1K+ZdPcumcQCCcg4z2qFRiU4Kh5R2dzACE9cBU1c5BeA/RIBx3qg2
+8pXtppwduST5xy41GSH72Sgi5B/iX5mzeUaiYqPBHo/OZ1lJ99uC8oX9URTJGmmo
+WLxrVxkbmo1vFIBD6953T+fx4uCS3Cs+CS3LHDWy13wZdxN5eVsA5GifzUGDrBRs
+EPLNY2ZHaXSTVodQj2PkUiChmxZWD3NlMH+N54e3
 -----END CERTIFICATE-----

spec/acceptance/files/client.key

@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----