Merge pull request #7 from Tinder/maxwelle/specify-mac-pk12-encoding

Force sha1 macalg and pbes
Tinder · Aug 25, 2023 · a5c81c3 · a5c81c3
2 parents 0037551 + 4951096
commit a5c81c3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Sources/SignHereLibrary/Commands/CreateProvisioningProfileCommand.swift b/Sources/SignHereLibrary/Commands/CreateProvisioningProfileCommand.swift
@@ -399,6 +399,12 @@ internal struct CreateProvisioningProfileCommand: ParsableCommand {
             opensslPath,
             "pkcs12",
             "-export",
+            "-macalg",
+            "sha1",
+            "-keypbe",
+            "PBE-SHA1-3DES",
+            "-certpbe",
+            "PBE-SHA1-3DES",
             "-inkey",
             privateKey.string,
             "-in",

diff --git a/Tests/SignHereLibraryTests/CreateProvisioningProfileCommandTests.swift b/Tests/SignHereLibraryTests/CreateProvisioningProfileCommandTests.swift
@@ -57,6 +57,7 @@ final class CreateProvisioningProfileCommandTests: XCTestCase {
             certificateSigningRequestSubject: "certificateSigningRequestSubject",
             bundleIdentifierName: "bundleIdentifierName"
         )
+        isRecording = false
     }
 
     override func tearDown() {

diff --git a/...ndTests/CreateProvisioningProfileCommandTests_test_execute_alreadyActiveCertificate.1.txt b/...ndTests/CreateProvisioningProfileCommandTests_test_execute_alreadyActiveCertificate.1.txt
@@ -30,10 +30,16 @@
     - .3: Optional<Data>.none
   ▿ (4 elements)
     - .0: "/usr/bin/env"
-    ▿ .1: 11 elements
+    ▿ .1: 17 elements
       - "/opensslPath"
       - "pkcs12"
       - "-export"
+      - "-macalg"
+      - "sha1"
+      - "-keypbe"
+      - "PBE-SHA1-3DES"
+      - "-certpbe"
+      - "PBE-SHA1-3DES"
       - "-inkey"
       - "privateKeyPath"
       - "-in"

diff --git a/...ommandTests/CreateProvisioningProfileCommandTests_test_execute_noActiveCertificates.1.txt b/...ommandTests/CreateProvisioningProfileCommandTests_test_execute_noActiveCertificates.1.txt
@@ -30,10 +30,16 @@
     - .3: Optional<Data>.none
   ▿ (4 elements)
     - .0: "/usr/bin/env"
-    ▿ .1: 11 elements
+    ▿ .1: 17 elements
       - "/opensslPath"
       - "pkcs12"
       - "-export"
+      - "-macalg"
+      - "sha1"
+      - "-keypbe"
+      - "PBE-SHA1-3DES"
+      - "-certpbe"
+      - "PBE-SHA1-3DES"
       - "-inkey"
       - "privateKeyPath"
       - "-in"