CI for Linux/macOS/Windows (#166)

2025-04-05 01:00:11 -05:00 · 2022-07-26 16:27:46 +02:00 · 2022-07-26 16:27:46 +02:00 · 3d0640a2cc
commit 3d0640a2cc
parent 28c68aeebf
22 changed files with 375 additions and 280 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,10 +1,8 @@
-name: ci
+name: CI

 on:
  push:
-    branches: [ "master" ]
  pull_request:
-    branches: [ "master" ]

 env:
  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@ -12,29 +10,99 @@ env:

 jobs:
  build:
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - triplet: x64-linux
+            os: ubuntu-latest
+            vcpkg_root: /usr/local/share/vcpkg
+            generator: Unix Makefiles
+          - triplet: x64-osx
+            os: macOS-latest
+            vcpkg_root: /usr/local/share/vcpkg
+            generator: Unix Makefiles
+            cache: /Users/runner/.cache/vcpkg/archives
+          - triplet: x64-windows
+            os: windows-latest
+            vcpkg_root: C:/vcpkg
+            generator: Ninja
+            cache: C:/Users/runneradmin/AppData/Local/vcpkg/archives
+          - triplet: x86-windows
+            os: windows-latest
+            vcpkg_root: C:/vcpkg
+            generator: Ninja
+            cache: C:/Users/runneradmin/AppData/Local/vcpkg/archives
+
+    runs-on: ${{matrix.os}}

    steps:
    - uses: actions/checkout@v3

-    - name: Install dependencies
+    - name: Cache the vcpkg archives
+      if: matrix.os != 'ubuntu-latest'
+      uses: actions/cache@v3
+      with:
+        path: ${{matrix.cache}}
+        key: ${{matrix.triplet}}
+
+    - name: Configure VS Toolchain (Windows)
+      if: matrix.os == 'windows-latest'
+      uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Install apt dependencies
+      if: matrix.os == 'ubuntu-latest'
      run: sudo apt-get install -y libssl-dev libcurl4-openssl-dev faketime

-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+    - name: Configure CMake without vcpkg
+      if: matrix.os == 'ubuntu-latest'
+      run: cmake
+        -G "${{matrix.generator}}"
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist
+
+    - name: Configure CMake with vcpkg
+      if: matrix.os != 'ubuntu-latest'
+      run: cmake
+        -G "${{matrix.generator}}"
+        -B ${{github.workspace}}/build
+        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist
+        -DCMAKE_TOOLCHAIN_FILE=${{matrix.vcpkg_root}}/scripts/buildsystems/vcpkg.cmake

    - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake
+        --build ${{github.workspace}}/build
+        --config ${{env.BUILD_TYPE}}
+
+    - name: List files (Unix/Linux)
+      if: matrix.os != 'windows-latest'
+      run: find .. -ls
+
+    - name: List files (Windows)
+      if: matrix.os == 'windows-latest'
+      run: Get-ChildItem -Recurse -Name ..

    - name: Test
      working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.  
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
      run: ctest -C ${{env.BUILD_TYPE}}

+    - name: Upload the errors
+      uses: actions/upload-artifact@v3
+      if: failure()
+      with:
+        name: errors-${{matrix.triplet}}
+        path: ${{github.workspace}}/build/Testing/Temporary/LastTest.log
+
+    - name: Install
+      run: cmake --install ${{github.workspace}}/build
+
+    - name: Upload the executables
+      uses: actions/upload-artifact@v3
+      with:
+        name: osslsigncode-${{matrix.triplet}}
+        path: ${{github.workspace}}/dist
+
+    env:
+      VCPKG_DEFAULT_TRIPLET: ${{matrix.triplet}}
--- a/.gitignore
+++ b/.gitignore
@ -30,7 +30,6 @@ stamp-h1
 *.def
 *.dll
 *.gz
-*.key
 *.la
 *.lib
 *.lo
--- a/cmake/SetCompilerFlags.cmake
+++ b/cmake/SetCompilerFlags.cmake
@ -20,10 +20,10 @@ function(add_compile_flags_target target)
      endif()
    endif()
    target_link_options(${target} PRIVATE -fstack-check)
-    target_link_options(${target} PRIVATE -fPIE -pie)
-    target_link_options(${target} PRIVATE -Wl,-z,relro)
-    target_link_options(${target} PRIVATE -Wl,-z,now)
-    target_link_options(${target} PRIVATE -Wl,-z,noexecstack)
+    #target_link_options(${target} PRIVATE -fPIE -pie)
+    #target_link_options(${target} PRIVATE -Wl,-z,relro)
+    #target_link_options(${target} PRIVATE -Wl,-z,now)
+    #target_link_options(${target} PRIVATE -Wl,-z,noexecstack)

    target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:-O2>)
    target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:-pedantic>)
--- a/tests/certs/CACert.pem
+++ b/tests/certs/CACert.pem
@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgIUK8d/QvlhUTD8VFVtm8J7dfwU0JkwDQYJKoZIhvcNAQEL
+MIIDoTCCAomgAwIBAgIUOK8lwJ8A1Oqw8jDAb3TF06ve+PcwDQYJKoZIhvcNAQEL
 BQAwWDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEDAOBgNVBAMMB1Jvb3QgQ0EwHhcN
 MTcwMTAxMDAwMDAwWhcNMjYxMTEwMDAwMDAwWjBYMQswCQYDVQQGEwJQTDEVMBMG
 A1UECgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv
 cml0eTEQMA4GA1UEAwwHUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMZ4wci7y7HUW8qAEnN116ASt4XnGOgMx4HBe/YJv3KXg6c89gd2eYQf
-SbNDvgjGanveVoHtx2JP/bvWBvYgDgpwIkx9atQB2445IEvENaDdLrpq0J3dnOyJ
-uPMFWvcdEi64uarcs2AReJh7Zj4EVL4/d84IfcQqJL2Ew+yeNe464z7dzOWgSoUc
-QwM3HH8ncFXM963L3BtdkoLU+si5njnB8NEhNpKPs0jlBWzrGBQSUBtBNCqePNMB
-RcdSo6hqL1vOi4OZjamddIJ5/xnZn8hX/43hQ/1EHGNqjLUWRcYrl03WDM7rV53K
-7f0cDrlp/98N0ia4oYrB4Yi3JyHfJwsCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUcxnOmEYbx/QWRcKMiSX9j2T0hMQwHwYDVR0jBBgwFoAUcxnO
-mEYbx/QWRcKMiSX9j2T0hMQwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA
-A4IBAQACOdaM9xyLmccY4eiQIQewAznjxHUB/FIosZ8xW9vqCUyVyC5Oo9G+0mXt
-FXYM2NMPIMsHeuWif9tndtnB8sLwSDUIGD9Wg+b26MkkK9HDLavAM+jq2XYDZint
-isYhDOXa7DMeogJxccFoeuTZCtNfQ7x0/dWOtgwQIuRF5OocNXXeEuej0ZQ45XQ4
-69fPoY1Zy5BplvgUUfpMz84adPB+DNS+rEzMpaY6HDdMNTwKAi9eGYRSyi0x9wAe
-H09JLPFEqCKBx3Z53+URrodzgC+VU6S9JPSoTZVikiRaTWV4N4D5jdbpujMwef3e
-d3lD695hpYviJsO75Ftb6R0M0S8F
+AQoCggEBAKzObJwYq4t9Y/OOQLqUNLU8RDXq284L8zQgRLkvApF87FNN7kozIgC9
+/HAgJSho/Lup5lzkCWa3fjkYm1EBrL+JihesSaCxxe7LOg6tRaY+WxikwMUnlkNE
+s3R+DogeGVsla4q0FEcICiz3FHTfSAUVmrN3Nj1ll7npJXrqmXxfCuO3slgjUkHq
+tdZ5t1rSWwbiUhGIQKLzo3/uw2XoOI28qpoOw+0/y8AyjWs8My3u8GrYFr+qh5fx
+Y0Zp0EhhAJo23Xd43XmeVKjuKIOaHu3JiM8sp9K1WFsTvFNAO27TBRn/X0mJCeDX
+T117dQxhWOCcQ/uRGuXICT4ign8MLtUCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQU6ewx3DIpbR8OptEmDFlYNELRqP4wHwYDVR0jBBgwFoAU6ewx
+3DIpbR8OptEmDFlYNELRqP4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA
+A4IBAQAhRMun0IzPmHVFM+SOfSCPVAgogWpqR5XlBAFlS+Aen6v3ukQAQjEhfBbE
+dZG6ye9i0ebf9qXYTvSq5wfaqP7FGb2/Z96uPXNMXPi796KjLW2CG578DitORPb7
+x1eV3UGrQX2bMQ0JbGkBU+DIdIRBqDfad/kjLtm5eHyCbaodSWdaZO4LSUIy3MBx
+2UeBj2qD4RTA0Dt7hG7RA5QdTxHlZyLIk8HX3krZ+il5RmSbOnQs/XqK5DJp4J5p
+122sIO4Y9ki+Wewzx8f3/7mcVbcMo67GwRHo8bk3GjWE74pczyrzfP68vDQ4tn85
+NcLPeLClfSziJD09z+Iyp94EQeKX
 -----END CERTIFICATE-----
--- a/tests/certs/CACertCRL.pem
+++ b/tests/certs/CACertCRL.pem
@ -2,12 +2,12 @@
 MIIB9zCB4AIBATANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
 CgwMb3NzbHNpZ25jb2RlMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
 eTEYMBYGA1UEAwwPSW50ZXJtZWRpYXRlIENBFw0xOTAxMDEwMDAwMDBaFw00MzAx
-MDEwMDAwMDBaMCcwJQIUKSt48Rg3QnHZPnv9V8IMgkpeYDoXDTIyMDYyNDA5MjYy
-OVqgIzAhMB8GA1UdIwQYMBaAFBwS2oY2LaAR6mlv1pGCXB8sJG/9MA0GCSqGSIb3
-DQEBCwUAA4IBAQAu/P9vJXkstWFFqHdYLWlwtS47IJqS6ZjFAIIZ/Ro2fIrjDaCO
-b6L1RpzRdPSLSLsVPIbhn+/hez7M7THwG/+pAcCs5mJd/A6Sx9c/41e6NIoz/r6+
-AG1OeT4zbYE1LcD/WJHPMy5BrOrTG7OTH8rSUt9K01TADHr7+uRhdjZC9gV3rZeT
-y4lq/AgPInV3HX2z1+/82LTGF1IgOeco95SZXe3VlCOhE6SLrEQA1G+dGkvQwjCX
-Eu1KjWRS8rEUB1EQsGIuos6v1cVESAwdCUB9hSJIkDNVaCmcfGfcYu+xz0RbI6Bc
-/Gwhfzf7cfRTwB6JwW7diJgqJVLSONKMrI91
+MDEwMDAwMDBaMCcwJQIUOpY5wp7DtqsdxII7sxculedk0PYXDTIyMDcyNjEzMDk1
+NlqgIzAhMB8GA1UdIwQYMBaAFJ4FrAtb4UB/ag702URPiid97ziLMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4Kw0vEJrtjjMam16iN/stOMxJDgkp1IQzA3narxr9fEjX5Ynk
+JztuEExtowPIDOLGWCySXNEMmxCzXNAMvlUq+UQvnWrwgHQ9R7TBYIcAY+VRmzKz
+T4PXvDSL2WMuJ1dLWoIcL2D0wEdti7YMvAnCrOC8HAPGgke5QcOgSfMSAYSAtpiw
+PZAFgcuo53AodlCw9J+CPcHPYw+C2QExOy8s8q6d8Xgjg+Ge7v3RxLWy74sNPl0u
+uZ79vcLNEeqEXxKaw5abqDqIDcUKIT3b62KsSxkak9IGNMLcTASw1V+YaKVLSYNW
+NTuc5WJblfZi/q7WUMKkmRERzvdg2rf0CSH1
 -----END X509 CRL-----
--- a/tests/certs/TSA.key
+++ b/tests/certs/TSA.key
@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCivbbTCnbOqPoV
+7VVP/KJzgslx8yfX9laGwTsvzqStQtG8j40ljR85WD/bgy3I5duebudg7JhOVH2f
+aSqbh8SCzP4YNDFcseDIuHdoXi54POgW3S/wbe8l8P7g3btcBgnlXh/izhUlEMib
+Q/8G8UZj0n/MgKMLzcXc4t2eQ4Pzw7xAPqoXBZ20Fg2rFBfUsDDLc5F7lpO5t1WQ
+dXTYmF0oAL/HLmd+HKe5Xgp9jJ6XacesjWLnhRdZ06uUP9cgo+Jem4QZxeFhOtMe
+KAf7JH3Juz2Gi0a+4dMSNzES4m8RAlf6pXh4kAh7EhMNb/Ir6ZpY8uKM7dtn38mh
+1f59EKc9AgMBAAECggEAK5zB0P695hYcpyGqOjxO4LvM9m+eXt7SQ1ynWuF6+j+s
+62ZhAg42rux6eH5IF82ZtHSuJyhgjKVR4RWS6IlS3WbINX5PODMnNUNSJLMQqwJP
+hEkUXs9nRni2JVbmrfukTUaTLvnhasR7rjhjsN2Z6ohv3UMf7rrfapmVoKMhSoLd
+jqvZ2ZoaT5mfTiK/5PDyWqrt/vmvE4VlipAsvudwozG5vQDEsCNDNUTg5OTGnPUU
+i0xeQTioqzCcweIlEaWhj/eMHx/eAeZ6V0Evid/YwTDlbTqVDWZGLJ/phOnKJs3V
+j+eOv7E2d1ga7149SPDIv5Y0YZ91v3M06ICk5o66gQKBgQDSM+YyR5YOJTSAuAcI
+uKTc33wwCbPiJF/F1zLJDdPp2IamZQbuNIX/8fOG3Gho+OnfNAykMcr3rFrug2vi
+9GhWDQqguYGh16xos+2zNan6P/s0/rQ4OfPIsTEGC8X3fJeMzZUNMvnyN/FXzzus
+020o29gu59esEfGHEsvAupC3IQKBgQDGMqGLgrU4oW/5mmm4BZlwwkZJNMmFH49u
+Qe4Ylj87SQduExJMmTfrmANqQXu7RXG0IxLcvhwMLVCCYAkvuBv1awsbg2yfP1Pn
+Wb/K+5CaHaxnpwSpRiGaN6fnAPDl8PnALMVXtQGru2MMcISxOIFQ9slHth0lmaMo
+odIPIL1YnQKBgAOSskUEhn5zD3NorWXujY7blabTY2VirOYWBFz6iTGeZpuJeBaw
+ed6h5DvUn0m5gXAz2EsqNYMEQP9w6HKRKPzdd+LHhHaVze5xsIatUNhaIhECi1mx
+Un2E1Yp+xLyyN3lDPVdeGHWPkeCmOyNy7JYXNpOFiVr5axuarC/4e+FBAoGAeuRR
+/mshaufOwnnYK15tcdlEM4gjnAOhr7/5ng0rT9tMXBg/NHeckNxE4dGQouHASu2k
+eHL4eSRv0ycxCwGhdF7XGEw5QdTGdaDUp0ussaLMj8ijv0HY/AKefUG8HRd6BIq+
+Ik/9pTofhEsQO8LJjCY5T9m/4NyOqlcMJI0sWpECgYBvPLnutbBXYONVAE3jL05K
+hWwenKpv5Aaa11ahqzhil2Tj+VOMtmvhsSc5loSG83qp5LtN4LxyR0Vn9AGN7Z+d
+Ut6LHeZ/DMW3/RPT+1MIKm6WLNxgk5YvuCxprdpfE5tTmV9/t+t3Uao7TRsLPl2o
+qAKz8Fvq0el5RW3EtAgd4A==
+-----END PRIVATE KEY-----
--- a/tests/certs/TSA.pem
+++ b/tests/certs/TSA.pem
@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEzTCCA7WgAwIBAgIUOfEovjEdUwxU3llVsP/j845Bmi4wDQYJKoZIhvcNAQEL
+MIIEzTCCA7WgAwIBAgIUfRjXKciCGA4XbhbhxbAwfpcLGmowDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAy/UScIYfmEkhQEjfzQQBGtQida4BLImrenu6cdCX3QUIBqNw
-ZPWks+hAJhaRBQhecyd+XkJR1dW2jrCWCGGJ6GZDPFH9WER7JbBID//s9+XVSuol
-xCThVr9RwKpPag2ZsRC8VeSRc7At/uX6lcd7sRG1Yu6Zb/MaabowjPLflVPZboC4
-y2xBf8uROS4eVffJPdwTwirNOTJtTwxOVOVaE0J1GZEdr8I1o1bmZjcYQ+/+VGB3
-mgs5dFvSVmYMzocdb05yxlf/CHfP6tSJufa1YjSHztpC9AJNYD7JUhkVeKEmFHtZ
-8Gf4KCPGqfqqrQJ6VMrNNImZ9i9vOE7u9GJZJwIDAQABo4IBiDCCAYQwDAYDVR0T
-AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUxWBfmgyH
-/JUPHYH604MsYcosbjYwHwYDVR0jBBgwFoAUgOyoninPDHD34LHDNEgwoIHPUzIw
+AQ8AMIIBCgKCAQEAor220wp2zqj6Fe1VT/yic4LJcfMn1/ZWhsE7L86krULRvI+N
+JY0fOVg/24MtyOXbnm7nYOyYTlR9n2kqm4fEgsz+GDQxXLHgyLh3aF4ueDzoFt0v
+8G3vJfD+4N27XAYJ5V4f4s4VJRDIm0P/BvFGY9J/zICjC83F3OLdnkOD88O8QD6q
+FwWdtBYNqxQX1LAwy3ORe5aTubdVkHV02JhdKAC/xy5nfhynuV4KfYyel2nHrI1i
+54UXWdOrlD/XIKPiXpuEGcXhYTrTHigH+yR9ybs9hotGvuHTEjcxEuJvEQJX+qV4
+eJAIexITDW/yK+maWPLijO3bZ9/JodX+fRCnPQIDAQABo4IBiDCCAYQwDAYDVR0T
+AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUKWCqogni
+6SseJ/P6LXo0M2cK++QwHwYDVR0jBBgwFoAU/5nNuG4Tm4v2y9uKf428/4fVQesw
 gYQGCCsGAQUFBwEBBHgwdjA5BggrBgEFBQcwAoYtaHR0cDovL1RTQUNBLnRpbWVz
 dGFtcGF1dGhvcml0eS5jb20vVFNBQ0EuY3J0MDkGCCsGAQUFBzABhi1odHRwOi8v
 b2NzcC5UU0FDQS50aW1lc3RhbXBhdXRob3JpdHkuY29tOjkwODAwPgYDVR0fBDcw
 NTAzoDGgL4YtaHR0cDovL1RTQUNBLnRpbWVzdGFtcGF1dGhvcml0eS5jb20vVFNB
 Q0EuY3JsMFUGA1UdHgROMEygGDAKggh0ZXN0LmNvbTAKggh0ZXN0Lm9yZ6EwMAqH
 CAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBUYQD1lhHtsmIInDG2hFUGnydialZpIy21wIKD1pUr
-D4+WHwLGhqCP/uq1RIRP++c4NXiRSsy5Qh1hJaNvyKNot6IFyE8J/9WWusuNy6ds
-Oi8sLVMmMLCasLRaYBeYQpgQiiKh3vguFF4mAmQx1Dt2W0XwyiqCCOA+1dC/XpSx
-wPbyqjg01IDuuo0ieygB+H5317coA+ZY0py2dU461owA1xJh5H0mBo2C4ZDd47K7
-DSgPlFQH1w7YRvjljoH/S8ir6AWDo/XWDqI5Ntwm5nYRh32RUAdDKijYL07sxehz
-DRdqCKnFc0hWpwswv2XBmXOh67wiUqlpI7KhOICtGEHd
+CSqGSIb3DQEBCwUAA4IBAQB4YXa5nVWUzWSsUDMfYFTEETOe8boUErwfrDNBuj6z
+B5en20FhI49i6PCYEfNq3vrAtPOEFJj+KPomN3C46VLxbUEvqWLdq6EyzWvVVmXK
+VLeC0qV0m6CFM8GplaWzZdfFTQaaLUhgY08ZU2gp4QsoS2YjAosxlZrNSm6pBbv3
+q+Og1KeSK8gKS0V89k+6e3LOEF6KaNWKSkoz5xDniQY//mTjiDcNmYUh0KhHfhdU
+eO92M82uJSaDqnRs5HsWPs6z6qdfpuvj++OtQ1VCM2p5SEH2sEomdeN3YYChuG4h
+yzn0mYAdbTyGJHlFm17AH+SQRbVqCKYdHDaqsMb+fWzi
 -----END CERTIFICATE-----
--- a/tests/certs/TSACA.pem
+++ b/tests/certs/TSACA.pem
@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDkDCCAnigAwIBAgIUUpGlWPFcTBqk4tMbyH+KTbO9/mcwDQYJKoZIhvcNAQEL
+MIIDkDCCAnigAwIBAgIUJ0nfE+EVsIThltlY2LHVWMJVIq4wDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
 dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlPnoARKfM6fzxkHC7PZar48cL2jkO7XpT
-xv/uO6yyd1qj353o7/rhT5REb291cMv59o7fv6uxdReWcIpjR3NxgyxJ8P8qxnbW
-wQJJIvL729hcP5L6Rbl6n8l0OmSPBIth9yzLpsuz3in9lfd65BKYswe8M26lgfP3
-Xky1uA+awt/Vsas7cYUvH94NsCQVU52mLanr9oVaI+7EPBlA9JwhNvUOlnSmOIix
-9ZQ9pkTN6+4ceQwq5zs845yglAkDl6JuKUNCDJQGejfBgokCSNbWmqUV9VaLS0BP
-LIAn9kyth2K/lIY1Wo+Bkc+020zY8QPfZ65G8RTR/bIsUqfpHQ11AgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIDsqJ4pzwxw9+CxwzRIMKCBz1My
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAK3lXc/QhlCnlPeT1
-qB9cq3HvMdAWS8+ekf5f++atMoZkRsn/Avfq8JB1i+hHmElAOuqZJDhyFSstehlK
-a69gBHY9l2NuMGtUMp6gRodjbpzxPHxKUqXpdyw29qfJhJlsYbn+pZ2KCZ35E2QP
-17RR4WvQ+nkNQfr1nfGL8yLw+Swv8T9okjYadvKjWfk6L2D6Q4WExtmWTuQgz+Fc
-PyvLEE8h1eS1ZTZtL1WzUUG48Mp0+tPDN9FoUoTGPflwMYDI/WChY6OluWKQiBBa
-tWCjX9xRBOi5BV/wzzzrj0q58lGXCDY8C7SQ4wYP/zt4HPSroACe4cKdJhaWULnP
-iA+12g==
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGOTX1f9dmtUiyzlsUInRIGfRMya338SVx
+vYGeOwdpTSSGlYUVwR9AuFewQF5+klelstCJe+SoUG0AdzS30mRWlQrhip4UdvdW
+T2gkNKbSn6DQzlWoQej9izqRLxAsbuszgkvnLOBEmPaLimDsCgu0bAN95Hp0Hls9
+O/fVmzh8VuV4iscxc7q13ZB7CylWgwd55CFEGd/jpJ6kMwSHbOLoBWp4GQ3KxR+c
+ASAo0FapU2WSZB2EYWszRiyq91X+AvIYN4ypTv7RccgfUvnZ2qFykJAkf/wgkynu
+Qg7rCUNfUEpDc7jlqtDWR7iLrtHBkA17C3IU8ymmKQYWfw3ZyBwvAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP+ZzbhuE5uL9svbin+NvP+H1UHr
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAbj3aFwIUxvzwgywO
+gj01JM8GNbw1E4MGdkaNI8rgeY8ay15ZXhR9NpRWWb6Y7IXPq5XhuEktVte5Z4Kf
+XLBrr7Xe9VVqJL9zd1tMzOEM/zG77rZf/iXBTZLkCtQc/GOEY4TTWKNEl5hiWVE0
+po97GX5XHoeyHlWQ75sd9z6MxFxmvdp9/uyYD700e9sd5gcD8LGvHw2DNy8vntYV
+ia9h95N9i1umffxU460o8W5GoIcsD13B3YftvnWhGSXqovBRFgcPAQZ4eW9Qh/zA
+4zQBQrRvmREPihXVdgtWVpbRchP99oSZBrYr7Hh/P69rycklquqxJl1ol1wbT6dK
+S5Gmng==
 -----END CERTIFICATE-----
--- a/tests/certs/cert.der
+++ b/tests/certs/cert.der
--- a/tests/certs/cert.p12
+++ b/tests/certs/cert.p12
--- a/tests/certs/cert.pem
+++ b/tests/certs/cert.pem
@ -1,46 +1,46 @@
 -----BEGIN CERTIFICATE-----
-MIID7jCCAtagAwIBAgIUN0zp2dBP3WkwF+SwIGkLBIQPw7owDQYJKoZIhvcNAQEL
+MIID7jCCAtagAwIBAgIUdLInHjkevRVCr7I78r5++6eSrZ0wDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMIGdMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEUMBIGA1UEAwwL
 Q2VydGlmaWNhdGUxJzAlBgkqhkiG9w0BCQEWGG9zc2xzaWduY29kZUBleGFtcGxl
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuZ/xV89skGlpud
-6WSYB3UVBnsf165/2o+W+e1NW5xjoYQ8F/0CXdhUsd1+adZLtOsOIHp00IMUJ02g
-ZAWe0rIpbvutI0xwW/L2Y24yVY3z3RAkefD0n9PpNACC8etbYABcyFzmS23Sp5X3
-IFwl8AUfoVVzxjQYHI2tLztVhITm9iRZU0G/oyC2KKPcRijtcPRnxf+PeBu9FPry
-K5ncdtHci7qAc8zojuG4S1DpvL08oj/+Nz8aFZqhPf9GVzxTy+GwaJNjU4ZP9B8e
-/SJwsicAtpw7+OQqUSzXHG71JshFBeDBBAiVvIO2yBHVJnxkU2AUCfESywTVQ48g
-FCMDdaUCAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUDb9z6FWiYrpDH6hU
-xXX2E9Q7C5wwHwYDVR0jBBgwFoAUHBLahjYtoBHqaW/WkYJcHywkb/0wEwYDVR0l
-BAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAMdNQX8FiW4sp8Jimmqw
-uJPXrEIA+PExLEIu+Ppvdylt3g0jMKwGeMl3IgItuQmatcYAAW51F8jVAhLJPmAj
-j5zVDrL085koRkHFWcmQmg72MLPHiYns2FBmNcUbmGm8J7zNMwdux7Kq7Oyu8zjy
-yWaCTkLRaQZuKeiPCjoY1s9hQGHCJuisIyr7RIj/sXJjY79u07K2+BZhimwkDi5V
-qph92/mM9jhdrnntJNfB0MvmmqyMP3x/+5ZRQY3ZH2hmKQl4BA8ugZ+5cVvkhUu7
-i+dgTwyiVxE6OoBJZG/DP2Jqqm/cOdV5e5iD2qk4NfMorcU2vmNLpJM/DqSBSppy
-s/U=
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJLJ3Vty2lgJw+5
+ouAV4ZqkIwvfWPcE7zD1CfQIL2802jVuCSTkN9cfFVYMKFEPJxQWJAKoCzr/Ux8z
+Yt9BXO5o39+z7umLKmc6pfrZJ6kG4msrMjZv36LsCQyfjUc1O9H1aiOQEvRQY2pF
+2v5dfqRMrAqH1ESQHCggUBjElWj9oMFax8jyO7JxTzuttOb6mhDmqz4q2u4LwZGH
+lBofgOAB54Mlv41x7dDh85i/jayXuYYmsjRwCuBAn14+D2zImyPDx5UaUJJMzujo
+QriOZ4KU2dHRgy0+vd7ZbrL1kRY1axyNQ+jBk7UHnlZZ2CCkhBoZIM6ez3ljPwgr
+cpg0RtcCAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUBxPEs09WXDxGqb+D
+WTFgcUQd0AEwHwYDVR0jBBgwFoAUngWsC1vhQH9qDvTZRE+KJ33vOIswEwYDVR0l
+BAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAKK2e1s1puUFbNjglopi
+mKZ4Pks2zb6LVUGG6Q4XQ1dWe25ovt68jWv56HFyCMI1N+L8q0+Ku2eOfLObS7Ej
+FFRUWEIXDgipryDTGzoWRM380fuYpL/j7Rt1/xmIHWTFibf/6gK/naRXsFH3dEbb
+7DDWQ5pAd2d60dB+ThUEIZQTQd/926Kuk5oESvP08fXMYTuiYARypG1gmiuvxQ9N
+mDJP6CHxyJR/LB4tb0RAqnLkVsXVBDnRYWdEvkuhoqTtbhVzVbL3mPeEmVYypxxd
+NdrHpU5zmxFSin2T3F0TneNcT+MDV+dQcWyTGNYs/fnmo85LsiakJixGv1qx8PTs
+8iE=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-AAOCAQ8AMIIBCgKCAQEA0CDXPd0a0ofDnNRdIqdKNgUrRieELntqzO1HkeJyJpXs
-RJa6IIApLbaCY6WcfQPZwM4XP39Ab0E7Os0YgUriXpWXjjm07CgF2wIau/gs9E9z
-TLaP4+LMOtcotfsZIAMEroB6VvYKmwCDWMKd/M3HpHuYaoLQgczLq/bQ+gtrK2O5
-Yng8D91ta85PySpgkXfXWDM+u+xBT8VV47BkgrSdHtNpK8gTZSpdMnNTaePCRsz1
-+BWZARJuJdSYUp1oFx+/UVZEQlUm1HDnhuxIMuAysUp6QpTPIrj1be2w1PKgncKN
-L4U4hRRSRVD6g9tUbZwG1zwhpRl8FrLn6e3/ZKtbZQIDAQABo2YwZDASBgNVHRMB
-Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQcEtqGNi2gEeppb9aRglwfLCRv/TAfBgNV
-HSMEGDAWgBRzGc6YRhvH9BZFwoyJJf2PZPSExDAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQELBQADggEBAFNJFQ0zjxcj2VflXKC1vDisC//4etwspxVUW+AQC3Kg
-ZqSIzrOtBaCCARtI6NOxF0udzVtfBc7Vd7MlxHWk/b863w75gDpOX8QiF9vrRb82
-AK2VmCafxQ0h2W6Sz7dYy4rok6xTRTBERxOMoaL9YHIWC8bktu6+uV/8V++HUstO
-SEw8+jBJGJo9aGYcfXpvbFnmPyoYz/ZkOipjlRsaMUTU8KXbXTIAtsbtf6OWD6QP
-pbik2FFbuR5aKUW9Vq94qWuXoqHv7oeTArFpPNK1FFTfFhPZwKlQ923YzaxjjFqx
-VzI33c6fGZpVlcPi+SvoodQVlG7YSegBV3J7UDMgVu8=
+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
 -----END CERTIFICATE-----
--- a/tests/certs/cert.spc
+++ b/tests/certs/cert.spc
--- a/tests/certs/crosscert.pem
+++ b/tests/certs/crosscert.pem
@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDzjCCAragAwIBAgIUEs90042H8xAMSoWSfQcuDLe/vj0wDQYJKoZIhvcNAQEL
+MIIDzjCCAragAwIBAgIUGjZdQYlcAtlqZOsQ7eWRimQ9PIcwDQYJKoZIhvcNAQEL
 BQAwbzELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEMMAoGA1UE
 CwwDQ1NQMRIwEAYDVQQDDAljcm9zc2NlcnQxJzAlBgkqhkiG9w0BCQEWGG9zc2xz
 aWduY29kZUBleGFtcGxlLmNvbTAeFw0xODAxMDEwMDAwMDBaFw0yMDA2MTkwMDAw
 MDBaMG8xCzAJBgNVBAYTAlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNV
 BAsMA0NTUDESMBAGA1UEAwwJY3Jvc3NjZXJ0MScwJQYJKoZIhvcNAQkBFhhvc3Ns
 c2lnbmNvZGVAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDM11GB+O80QZUkuMaDo4wsZGiBQlTIg5OY7i/WSc6nVypFTwD+Pj0gFtpZ
-FCYngOv03A0oByskXtGCub4f+4OgsVnhs2DhXQTApjagf6lDZj5axrv6kT6tHxjK
-jG/UxsiV5ohmTxbI4QNA5qXDOFG6m2f7D7sMXvxBM4xUHuoagHHf8Sfyb4rNzHR/
-JkwfQPxqnHZHKS4gsoul1WIo1a/Y3WHLarCgL6tob9qqaJN3wTE1mEItDuOc89wA
-X7Swqwtqst33mAyP91HpbbGIt1mPDNdJ4szshMWlwPF7DQguKcvhslKmuLSprxsi
-i5nkhBlehuZ+6krP6pGeyhP9W+R9AgMBAAGjYjBgMAkGA1UdEwQCMAAwHQYDVR0O
-BBYEFBB+ke+OVFLvAqrX4g8NtPN4nbjSMB8GA1UdIwQYMBaAFBB+ke+OVFLvAqrX
-4g8NtPN4nbjSMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IB
-AQASfjHs3EwVo/d0Jhgf2YgerT/clkvKIPOiwz7XsiFAKuGWfT2x15sW76GAMsem
-ohQP60y6cmtrFNh9BFkOrdkBwqjx+VucrZaqDV1he4xW1eh+qDe1qtu6J0JBG1q7
-LX9uk+W+V/8ZvSnGZP/T3NHi1/lzEPBLth46K/aAdNxeB/EjM3uTryAp6erhd25M
-J6EuN42zVp04pl9XDQxjySEWaFtfQYa1bmUe8herfQg51onRMqHwo7nE7tlt9SB1
-Ch9KNlraY8N0UVEZGzSPpvOoHeOnYWBfZ9VqIyiYffL+Pi22dW9Iy/HMwe8lXTYu
-aMdAj6l4RFrLCH3RyaRh6fH9
+AoIBAQDJU6WNMOEoErLYb5Qc7jsvVgruPM7DJTZ4vUpJNYAyprSDHciaKSa4SiYS
+84Mxc6tzBoJvKOAwpxzzONOqPVWUd5J244urgvfHgSGWsbA8bakiIYlETopnecFk
+B3ZELR33CPqIbpYYMYujhPGFa1xxZxFykJ1iBhZ8Gh3W4wHi/2kW6hTQkihMtUPP
+Xxc2XWACj/tz22OSdgNZcIfhXiy2HOuPch+0UlDR4UmlJIR5aet1y832hHoeeevo
+qfhfGOm9rRf9nyxKDwTyaN7JVOb7A1k6KJEJoe1zfIwT56mgoA433iUWFMLB6hKU
+be3zV1vGjk77Kk7atcvEMTRq+rwHAgMBAAGjYjBgMAkGA1UdEwQCMAAwHQYDVR0O
+BBYEFEXgglEcDh+8oCCvjlxrN/Y7C4YwMB8GA1UdIwQYMBaAFEXgglEcDh+8oCCv
+jlxrN/Y7C4YwMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IB
+AQBo8UqUEjxGQCVU/IgphwKA8Rb/uAyBYm+AjqFDs82lA6ze0n08Bj+eciVkxscA
+0deivOC1sDD88QkLzSQ9CPk4e7+m7nx5SFUnUWY+o3ln+cTbGSM0jW9hme0LtHXX
+QxDSKDBhQonRQk7lQ+TwFR7ol+y5SdZy7YQ+v/25qO6MMQgSPykJIa4vF7lwrYhu
+qL+1MJx/ryTbCUExcKNNkWHZJRc9ZvtdWEHYpBSZl5xmJdKMLnHAu5uv8N2pezzp
+PfujldZky7bnERaTM+bf/LvKXS8RfQGrCLu9QjgPVa6ysZV6gXTsEtwYh64vucjS
+s7IhdLxfiT0xYkK4JWrRLc38
 -----END CERTIFICATE-----
--- a/tests/certs/expired.pem
+++ b/tests/certs/expired.pem
@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIID6jCCAtKgAwIBAgIUJfIfVOecAzqv4xy+JOBcy5YzjEQwDQYJKoZIhvcNAQEL
+MIID6jCCAtKgAwIBAgIUdtBZJAw8/6JVNMiQpN3PEROI8rowDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0xOTAxMDEwMDAwMDBaMIGZMQswCQYDVQQG
 EwJQTDEZMBcGA1UECAwQTWF6b3ZpYSBQcm92aW5jZTEPMA0GA1UEBwwGV2Fyc2F3
 MRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UEAwwH
 RXhwaXJlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUuY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu5n/FXz2yQaWm53pZJgH
-dRUGex/Xrn/aj5b57U1bnGOhhDwX/QJd2FSx3X5p1ku06w4genTQgxQnTaBkBZ7S
-silu+60jTHBb8vZjbjJVjfPdECR58PSf0+k0AILx61tgAFzIXOZLbdKnlfcgXCXw
-BR+hVXPGNBgcja0vO1WEhOb2JFlTQb+jILYoo9xGKO1w9GfF/494G70U+vIrmdx2
-0dyLuoBzzOiO4bhLUOm8vTyiP/43PxoVmqE9/0ZXPFPL4bBok2NThk/0Hx79InCy
-JwC2nDv45CpRLNccbvUmyEUF4MEECJW8g7bIEdUmfGRTYBQJ8RLLBNVDjyAUIwN1
-pQIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBQNv3PoVaJiukMfqFTFdfYT
-1DsLnDAfBgNVHSMEGDAWgBQcEtqGNi2gEeppb9aRglwfLCRv/TATBgNVHSUEDDAK
-BggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAvzONTsW2MbOqmEDgBHxM1nUS
-Ov3p3GgZZveteglDBK4mDiCTMhE6MSflmcEFvVRnYbfVUepSLu1crXlBIyj99eRy
-MuGdo+4/s3gpi25zZ7LPaxesiUoFIVNPr0cQXO/pm/T/D9Q0XYP6D+rrK6VJCofP
-JcmI493t9vojBlYdac8NNRt3tJjIAD4w794jpASAluAgy113sS/Dc5k4nRlmMEBU
-48DJqe6HnO0n3cKSP1qSVkGnA7/EU/w0DIhMJBamERqDWfLWeo8RcOA05xKslTRL
-pWPuzNpREN5MKqCpy4auTq5CP6YXRwQ+FuGeeRqotw2usUXtwTOO9KV61/PKpA==
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsksndW3LaWAnD7mi4BXh
+mqQjC99Y9wTvMPUJ9AgvbzTaNW4JJOQ31x8VVgwoUQ8nFBYkAqgLOv9THzNi30Fc
+7mjf37Pu6YsqZzql+tknqQbiaysyNm/fouwJDJ+NRzU70fVqI5AS9FBjakXa/l1+
+pEysCofURJAcKCBQGMSVaP2gwVrHyPI7snFPO6205vqaEOarPira7gvBkYeUGh+A
+4AHngyW/jXHt0OHzmL+NrJe5hiayNHAK4ECfXj4PbMibI8PHlRpQkkzO6OhCuI5n
+gpTZ0dGDLT693tlusvWRFjVrHI1D6MGTtQeeVlnYIKSEGhkgzp7PeWM/CCtymDRG
+1wIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBQHE8SzT1ZcPEapv4NZMWBx
+RB3QATAfBgNVHSMEGDAWgBSeBawLW+FAf2oO9NlET4onfe84izATBgNVHSUEDDAK
+BggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAX1Ar7jRAXdcA0Wu37yRi58QN
+hpa1VLXadqfB+i5Y4e3DzqnMbpkLWsFzreC1AG0RjLe52s4PRUE6boGlpUeAyfFC
+Qu2Gl/REVWwMCYV8bq3vQZkYQjklAXCQLWFk5TrzuDmBcV8+fY518nWw+xmcYwW5
+5oehLsvB4nxoBzlHgcdDwS5b2dmpCKCbZFLU9aA9DjAVvY/9B8emyj7Sh2sEK0Yf
+xwHlATTVq5O0/9tvVZQmYsbpS0iCRGBM+spTEhDT4WGsaRO6wP+Ucgp6Ym3ahMvz
+tHME3uUanKWVoDb69sguGZ6KlnZZZdIX1AJ3dlTXCrzEO9xsoAzqzsxVJGrraQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
--- a/tests/certs/intermediate.pem
+++ b/tests/certs/intermediate.pem
@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
 -----END CERTIFICATE-----
--- a/tests/certs/key.der
+++ b/tests/certs/key.der
--- a/tests/certs/key.pem
+++ b/tests/certs/key.pem
@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
--- a/tests/certs/key.pvk
+++ b/tests/certs/key.pvk
--- a/tests/certs/keyp.pem
+++ b/tests/certs/keyp.pem
@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,57F833C69C1085A8
+DEK-Info: DES-EDE3-CBC,6DB255395263EDD5

-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
+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
 -----END RSA PRIVATE KEY-----
--- a/tests/certs/revoked.pem
+++ b/tests/certs/revoked.pem
@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIUKSt48Rg3QnHZPnv9V8IMgkpeYDowDQYJKoZIhvcNAQEL
+MIIDvTCCAqWgAwIBAgIUOpY5wp7DtqsdxII7sxculedk0PYwDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEgMB4GA1UE
 CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGDAWBgNVBAMMD0ludGVybWVkaWF0
 ZSBDQTAeFw0xODAxMDEwMDAwMDBaFw0yNDEyMzEwMDAwMDBaMG0xCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxDDAKBgNVBAsMA0NTUDEQMA4GA1UE
 AwwHUmV2b2tlZDEnMCUGCSqGSIb3DQEJARYYb3NzbHNpZ25jb2RlQGV4YW1wbGUu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu5n/FXz2yQaWm53p
-ZJgHdRUGex/Xrn/aj5b57U1bnGOhhDwX/QJd2FSx3X5p1ku06w4genTQgxQnTaBk
-BZ7Ssilu+60jTHBb8vZjbjJVjfPdECR58PSf0+k0AILx61tgAFzIXOZLbdKnlfcg
-XCXwBR+hVXPGNBgcja0vO1WEhOb2JFlTQb+jILYoo9xGKO1w9GfF/494G70U+vIr
-mdx20dyLuoBzzOiO4bhLUOm8vTyiP/43PxoVmqE9/0ZXPFPL4bBok2NThk/0Hx79
-InCyJwC2nDv45CpRLNccbvUmyEUF4MEECJW8g7bIEdUmfGRTYBQJ8RLLBNVDjyAU
-IwN1pQIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBQNv3PoVaJiukMfqFTF
-dfYT1DsLnDAfBgNVHSMEGDAWgBQcEtqGNi2gEeppb9aRglwfLCRv/TATBgNVHSUE
-DDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAZ81n6gfyoXqHXDuQVd0X
-w1Qqts+bkuLUy33SEypNYzSy+KXGme0JGVLZH6uDRAqiUkDOV4KmAPNKnZ9LOp9P
-DETGYJdlnormvh1QyyTk8PdNUp7sLap6AKcZPxSmc4iHvWKMZ93Xq1HVXL4PF4j0
-hi7iAyA5nmiHv/mVIVap7amWiJHIVHJg6xwTy53erYhCkMq/EibFs0brKUVOMddU
-vsdTLp1XC7xH0oFP8zkzMkME+E8Kl00Yz2p9RnhBqt0TGQ/MBrsx6sBTzM6JVZ71
-Iol5hFzJabxCq1YrAb7zOzigXyOB/HSgw/lFSTuGtO66/sJb/UB4DLLOVkz8UTnK
-0w==
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsksndW3LaWAnD7mi
+4BXhmqQjC99Y9wTvMPUJ9AgvbzTaNW4JJOQ31x8VVgwoUQ8nFBYkAqgLOv9THzNi
+30Fc7mjf37Pu6YsqZzql+tknqQbiaysyNm/fouwJDJ+NRzU70fVqI5AS9FBjakXa
+/l1+pEysCofURJAcKCBQGMSVaP2gwVrHyPI7snFPO6205vqaEOarPira7gvBkYeU
+Gh+A4AHngyW/jXHt0OHzmL+NrJe5hiayNHAK4ECfXj4PbMibI8PHlRpQkkzO6OhC
+uI5ngpTZ0dGDLT693tlusvWRFjVrHI1D6MGTtQeeVlnYIKSEGhkgzp7PeWM/CCty
+mDRG1wIDAQABo2IwYDAJBgNVHRMEAjAAMB0GA1UdDgQWBBQHE8SzT1ZcPEapv4NZ
+MWBxRB3QATAfBgNVHSMEGDAWgBSeBawLW+FAf2oO9NlET4onfe84izATBgNVHSUE
+DDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAYVJiPrkACW/tK487fYS/
+gYzU3fYVCTfHpAv3njarNzy8UBNqBYr0kDg0DLoOWqGV7ogTtlbQP4IIjAQI/kW6
+cEreW8yU5VxO+kxDo+7oG9VEbR85i6kQW2ubJsXV6yBtf5aAbXEqImYrtjh7UObb
+BbQiUI1ll2dXWqvZGxr3Fz1uz8nPMYlBpVjpCh6JF8otdWwABmxRnqUvoLO6BZbH
+/gdUkouXfio9BlWkWaJXJGXMW8B7ozpjuCHSHyfvGKDA3YIfa7++A1BIKxW72jIF
+jRJDw/rwnV59tiEcBWmp2T6vV+rD8yaS+LotRPYD/ck/jEj/mV+N077KLmuZpdJF
+ag==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
-AAOCAQ8AMIIBCgKCAQEA0CDXPd0a0ofDnNRdIqdKNgUrRieELntqzO1HkeJyJpXs
-RJa6IIApLbaCY6WcfQPZwM4XP39Ab0E7Os0YgUriXpWXjjm07CgF2wIau/gs9E9z
-TLaP4+LMOtcotfsZIAMEroB6VvYKmwCDWMKd/M3HpHuYaoLQgczLq/bQ+gtrK2O5
-Yng8D91ta85PySpgkXfXWDM+u+xBT8VV47BkgrSdHtNpK8gTZSpdMnNTaePCRsz1
-+BWZARJuJdSYUp1oFx+/UVZEQlUm1HDnhuxIMuAysUp6QpTPIrj1be2w1PKgncKN
-L4U4hRRSRVD6g9tUbZwG1zwhpRl8FrLn6e3/ZKtbZQIDAQABo2YwZDASBgNVHRMB
-Af8ECDAGAQH/AgEAMB0GA1UdDgQWBBQcEtqGNi2gEeppb9aRglwfLCRv/TAfBgNV
-HSMEGDAWgBRzGc6YRhvH9BZFwoyJJf2PZPSExDAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQELBQADggEBAFNJFQ0zjxcj2VflXKC1vDisC//4etwspxVUW+AQC3Kg
-ZqSIzrOtBaCCARtI6NOxF0udzVtfBc7Vd7MlxHWk/b863w75gDpOX8QiF9vrRb82
-AK2VmCafxQ0h2W6Sz7dYy4rok6xTRTBERxOMoaL9YHIWC8bktu6+uV/8V++HUstO
-SEw8+jBJGJo9aGYcfXpvbFnmPyoYz/ZkOipjlRsaMUTU8KXbXTIAtsbtf6OWD6QP
-pbik2FFbuR5aKUW9Vq94qWuXoqHv7oeTArFpPNK1FFTfFhPZwKlQ923YzaxjjFqx
-VzI33c6fGZpVlcPi+SvoodQVlG7YSegBV3J7UDMgVu8=
+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
 -----END CERTIFICATE-----
--- a/tests/certs/revoked.spc
+++ b/tests/certs/revoked.spc
--- a/tests/certs/tsa-chain.pem
+++ b/tests/certs/tsa-chain.pem
@ -1,50 +1,50 @@
 -----BEGIN CERTIFICATE-----
-MIIEzTCCA7WgAwIBAgIUOfEovjEdUwxU3llVsP/j845Bmi4wDQYJKoZIhvcNAQEL
+MIIEzTCCA7WgAwIBAgIUfRjXKciCGA4XbhbhxbAwfpcLGmowDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xODAxMDEwMDAwMDBaFw0yODAxMDEwMDAwMDBaMFUxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxHDAaBgNVBAsME1RpbWVzdGFtcCBB
 dXRob3JpdHkxETAPBgNVBAMMCFRlc3QgVFNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAy/UScIYfmEkhQEjfzQQBGtQida4BLImrenu6cdCX3QUIBqNw
-ZPWks+hAJhaRBQhecyd+XkJR1dW2jrCWCGGJ6GZDPFH9WER7JbBID//s9+XVSuol
-xCThVr9RwKpPag2ZsRC8VeSRc7At/uX6lcd7sRG1Yu6Zb/MaabowjPLflVPZboC4
-y2xBf8uROS4eVffJPdwTwirNOTJtTwxOVOVaE0J1GZEdr8I1o1bmZjcYQ+/+VGB3
-mgs5dFvSVmYMzocdb05yxlf/CHfP6tSJufa1YjSHztpC9AJNYD7JUhkVeKEmFHtZ
-8Gf4KCPGqfqqrQJ6VMrNNImZ9i9vOE7u9GJZJwIDAQABo4IBiDCCAYQwDAYDVR0T
-AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUxWBfmgyH
-/JUPHYH604MsYcosbjYwHwYDVR0jBBgwFoAUgOyoninPDHD34LHDNEgwoIHPUzIw
+AQ8AMIIBCgKCAQEAor220wp2zqj6Fe1VT/yic4LJcfMn1/ZWhsE7L86krULRvI+N
+JY0fOVg/24MtyOXbnm7nYOyYTlR9n2kqm4fEgsz+GDQxXLHgyLh3aF4ueDzoFt0v
+8G3vJfD+4N27XAYJ5V4f4s4VJRDIm0P/BvFGY9J/zICjC83F3OLdnkOD88O8QD6q
+FwWdtBYNqxQX1LAwy3ORe5aTubdVkHV02JhdKAC/xy5nfhynuV4KfYyel2nHrI1i
+54UXWdOrlD/XIKPiXpuEGcXhYTrTHigH+yR9ybs9hotGvuHTEjcxEuJvEQJX+qV4
+eJAIexITDW/yK+maWPLijO3bZ9/JodX+fRCnPQIDAQABo4IBiDCCAYQwDAYDVR0T
+AQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAdBgNVHQ4EFgQUKWCqogni
+6SseJ/P6LXo0M2cK++QwHwYDVR0jBBgwFoAU/5nNuG4Tm4v2y9uKf428/4fVQesw
 gYQGCCsGAQUFBwEBBHgwdjA5BggrBgEFBQcwAoYtaHR0cDovL1RTQUNBLnRpbWVz
 dGFtcGF1dGhvcml0eS5jb20vVFNBQ0EuY3J0MDkGCCsGAQUFBzABhi1odHRwOi8v
 b2NzcC5UU0FDQS50aW1lc3RhbXBhdXRob3JpdHkuY29tOjkwODAwPgYDVR0fBDcw
 NTAzoDGgL4YtaHR0cDovL1RTQUNBLnRpbWVzdGFtcGF1dGhvcml0eS5jb20vVFNB
 Q0EuY3JsMFUGA1UdHgROMEygGDAKggh0ZXN0LmNvbTAKggh0ZXN0Lm9yZ6EwMAqH
 CAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBUYQD1lhHtsmIInDG2hFUGnydialZpIy21wIKD1pUr
-D4+WHwLGhqCP/uq1RIRP++c4NXiRSsy5Qh1hJaNvyKNot6IFyE8J/9WWusuNy6ds
-Oi8sLVMmMLCasLRaYBeYQpgQiiKh3vguFF4mAmQx1Dt2W0XwyiqCCOA+1dC/XpSx
-wPbyqjg01IDuuo0ieygB+H5317coA+ZY0py2dU461owA1xJh5H0mBo2C4ZDd47K7
-DSgPlFQH1w7YRvjljoH/S8ir6AWDo/XWDqI5Ntwm5nYRh32RUAdDKijYL07sxehz
-DRdqCKnFc0hWpwswv2XBmXOh67wiUqlpI7KhOICtGEHd
+CSqGSIb3DQEBCwUAA4IBAQB4YXa5nVWUzWSsUDMfYFTEETOe8boUErwfrDNBuj6z
+B5en20FhI49i6PCYEfNq3vrAtPOEFJj+KPomN3C46VLxbUEvqWLdq6EyzWvVVmXK
+VLeC0qV0m6CFM8GplaWzZdfFTQaaLUhgY08ZU2gp4QsoS2YjAosxlZrNSm6pBbv3
+q+Og1KeSK8gKS0V89k+6e3LOEF6KaNWKSkoz5xDniQY//mTjiDcNmYUh0KhHfhdU
+eO92M82uJSaDqnRs5HsWPs6z6qdfpuvj++OtQ1VCM2p5SEH2sEomdeN3YYChuG4h
+yzn0mYAdbTyGJHlFm17AH+SQRbVqCKYdHDaqsMb+fWzi
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkDCCAnigAwIBAgIUUpGlWPFcTBqk4tMbyH+KTbO9/mcwDQYJKoZIhvcNAQEL
+MIIDkDCCAnigAwIBAgIUJ0nfE+EVsIThltlY2LHVWMJVIq4wDQYJKoZIhvcNAQEL
 BQAwYDELMAkGA1UEBhMCUEwxFTATBgNVBAoMDG9zc2xzaWduY29kZTEkMCIGA1UE
 CwwbVGltZXN0YW1wIEF1dGhvcml0eSBSb290IENBMRQwEgYDVQQDDAtUU0EgUm9v
 dCBDQTAeFw0xNzAxMDEwMDAwMDBaFw0yNjExMTAwMDAwMDBaMGAxCzAJBgNVBAYT
 AlBMMRUwEwYDVQQKDAxvc3Nsc2lnbmNvZGUxJDAiBgNVBAsMG1RpbWVzdGFtcCBB
 dXRob3JpdHkgUm9vdCBDQTEUMBIGA1UEAwwLVFNBIFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlPnoARKfM6fzxkHC7PZar48cL2jkO7XpT
-xv/uO6yyd1qj353o7/rhT5REb291cMv59o7fv6uxdReWcIpjR3NxgyxJ8P8qxnbW
-wQJJIvL729hcP5L6Rbl6n8l0OmSPBIth9yzLpsuz3in9lfd65BKYswe8M26lgfP3
-Xky1uA+awt/Vsas7cYUvH94NsCQVU52mLanr9oVaI+7EPBlA9JwhNvUOlnSmOIix
-9ZQ9pkTN6+4ceQwq5zs845yglAkDl6JuKUNCDJQGejfBgokCSNbWmqUV9VaLS0BP
-LIAn9kyth2K/lIY1Wo+Bkc+020zY8QPfZ65G8RTR/bIsUqfpHQ11AgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIDsqJ4pzwxw9+CxwzRIMKCBz1My
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAK3lXc/QhlCnlPeT1
-qB9cq3HvMdAWS8+ekf5f++atMoZkRsn/Avfq8JB1i+hHmElAOuqZJDhyFSstehlK
-a69gBHY9l2NuMGtUMp6gRodjbpzxPHxKUqXpdyw29qfJhJlsYbn+pZ2KCZ35E2QP
-17RR4WvQ+nkNQfr1nfGL8yLw+Swv8T9okjYadvKjWfk6L2D6Q4WExtmWTuQgz+Fc
-PyvLEE8h1eS1ZTZtL1WzUUG48Mp0+tPDN9FoUoTGPflwMYDI/WChY6OluWKQiBBa
-tWCjX9xRBOi5BV/wzzzrj0q58lGXCDY8C7SQ4wYP/zt4HPSroACe4cKdJhaWULnP
-iA+12g==
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGOTX1f9dmtUiyzlsUInRIGfRMya338SVx
+vYGeOwdpTSSGlYUVwR9AuFewQF5+klelstCJe+SoUG0AdzS30mRWlQrhip4UdvdW
+T2gkNKbSn6DQzlWoQej9izqRLxAsbuszgkvnLOBEmPaLimDsCgu0bAN95Hp0Hls9
+O/fVmzh8VuV4iscxc7q13ZB7CylWgwd55CFEGd/jpJ6kMwSHbOLoBWp4GQ3KxR+c
+ASAo0FapU2WSZB2EYWszRiyq91X+AvIYN4ypTv7RccgfUvnZ2qFykJAkf/wgkynu
+Qg7rCUNfUEpDc7jlqtDWR7iLrtHBkA17C3IU8ymmKQYWfw3ZyBwvAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP+ZzbhuE5uL9svbin+NvP+H1UHr
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAbj3aFwIUxvzwgywO
+gj01JM8GNbw1E4MGdkaNI8rgeY8ay15ZXhR9NpRWWb6Y7IXPq5XhuEktVte5Z4Kf
+XLBrr7Xe9VVqJL9zd1tMzOEM/zG77rZf/iXBTZLkCtQc/GOEY4TTWKNEl5hiWVE0
+po97GX5XHoeyHlWQ75sd9z6MxFxmvdp9/uyYD700e9sd5gcD8LGvHw2DNy8vntYV
+ia9h95N9i1umffxU460o8W5GoIcsD13B3YftvnWhGSXqovBRFgcPAQZ4eW9Qh/zA
+4zQBQrRvmREPihXVdgtWVpbRchP99oSZBrYr7Hh/P69rycklquqxJl1ol1wbT6dK
+S5Gmng==
 -----END CERTIFICATE-----