From bec328dcc9401c21239f322c426e2d6533a4d2ce Mon Sep 17 00:00:00 2001
From: Camden Narzt <c.narzt@me.com>
Date: Mon, 26 Aug 2024 13:16:52 -0600
Subject: [PATCH] add missing keys for identity

---
 dev/ci/Developer.key | 28 ++++++++++++++++++++++++++++
 dev/ci/Developer.pub |  9 +++++++++
 dev/ci/setup-host    | 13 +++++--------
 3 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 dev/ci/Developer.key
 create mode 100644 dev/ci/Developer.pub

diff --git a/dev/ci/Developer.key b/dev/ci/Developer.key
new file mode 100644
index 0000000000..6c025a04ef
--- /dev/null
+++ b/dev/ci/Developer.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC1Lh6Rkh2dD2gH
+AZ8SlIB9Q1tmLzTAnH9S06CQ+DUdABNsJ3x9rpSha5qWMVtxYoG5/FRFeNYLicc3
+IFEDs/i6aX0S/ZioO6uik31obPB7CL5QL46a1sUuNqFlhrzQbrutDU3KUCCAVL97
+tUTy1f8eVngdnYrMs9YIffTG3qbW+mq02E0ae3chsCrn4+VGlazdoozZM93YEBbL
+e5X+7pS5wUjGxLpnDUkjyGnoi03ceCljj5CeIlQkK0++l2clBSQPgolCmFJ9iWk1
+nhbB3aOtym4rDFOkRAlrkC6X4WX71BMwjmN16vdr/1ZtC2bfgV4BgmspuJMdbqfC
+knyF521jAgMBAAECggEARmvbo9c4PXDcjUSbELy5yHZi0y/sACWT85ygH1jqRBBg
+fDxIzg0KZkeNuW0LzuFr7N9f3fTetXNjBFFCS/8q4UHZRIVfTZyL1NAhAXK+cgPu
+/PnPIu3xjEndp7mcMCOqPNQb9VP5ngfSuYG2f/CfjaosW859QZ1wxrI2bwnhrVLW
+soxwg7SwQ6zhn27YgHhP7GBy9rrB+DSspSlNVekJwi3wE+J2laZ9c/PxfCUpH1Vj
+wSGUyup4mVwfL+oLAgkE5PDYHWQD9XARFPhn+d4RpaSXqAkS0jYGyXa/iB0oci/5
+THXvKKafmpZXfTF+1XckzRs7VMUsq5dWQHgOd1kJEQKBgQDZ6/jkLQdTYn9/sw27
+AQBZzlCcHa3r/xm3s2DGVKz8lB1pgTHG5SKbpilY+uU3aLV8FLCtCG50zMLgU+bi
+hTg0grL0yHIA4aUc5T9rRZ3izOT1xQXnHP8Q1YVyCo47eADP4E/HcZ9kEUZwJEU4
+UwIsVwYB9IHC+d2XmoZjX97e6wKBgQDU1qErpF57hMTSHcR3zaPfaMKTYzzvfweg
+6Y3oPrBY2dEne1XX5j5hxUhsAmAJmn9ctoqm4O7mbaQbE/eNHZWSYNNEick0Ds01
+VvAAWogES7vmreoYRw/6aQXz7ZsJekN8HGKNMolrfActV2gqRyxUi+doSxZq/U6I
+3gHB8SA9aQKBgHwTULiJsrwVPsa0acLphQuc3mSkuVu++SOQrC8AEyYUJtLlTjQS
+TiwU5UHWSB/OLFajaRx7yngSBXq4CqM6eo/bQo0Ae3hpARt8oykukACL7GjKbtvx
+tIAfMkWGIQlXAA9bhdDmrnvJIjPDUu4IxRn9ylvenOsoXLRutMlr0ndVAoGALL7a
+r2QlAO7OuiXL8ivnccaCcZ4BZ5BbODchwFu9k1BnqldBmtwq7T8elKaDLkGu2Pz/
+dUoAr60JPTAbcS1xDo8Qm24kQK+D8NzQJCLkSZLqc/rIJkZ6U3jU6Y1gdMOhgGwv
+Q+QGA/TVRXEE0y6XYUbwZXqzwdZzNk8GK5HX51ECgYA4AEu9Tbp8+R+3oOLib2mD
+I4VtYpGiSch07yYeiYU5k3BsXKPlHRSxjhmTnxRD4j4h6yZIeExDyby76oFZaAru
+4DvGC42Cu2jGaJQJV8X3fY4DmxygzRv8vTgqA8koUHyAnysR06bjSn/USkvkTA1Z
+Gqqi6XNf1ixGj4eZiyxUDA==
+-----END PRIVATE KEY-----
diff --git a/dev/ci/Developer.pub b/dev/ci/Developer.pub
new file mode 100644
index 0000000000..30d345d872
--- /dev/null
+++ b/dev/ci/Developer.pub
@@ -0,0 +1,9 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtS4ekZIdnQ9oBwGfEpSA
+fUNbZi80wJx/UtOgkPg1HQATbCd8fa6UoWualjFbcWKBufxURXjWC4nHNyBRA7P4
+uml9Ev2YqDuropN9aGzwewi+UC+OmtbFLjahZYa80G67rQ1NylAggFS/e7VE8tX/
+HlZ4HZ2KzLPWCH30xt6m1vpqtNhNGnt3IbAq5+PlRpWs3aKM2TPd2BAWy3uV/u6U
+ucFIxsS6Zw1JI8hp6ItN3HgpY4+QniJUJCtPvpdnJQUkD4KJQphSfYlpNZ4Wwd2j
+rcpuKwxTpEQJa5Aul+Fl+9QTMI5jder3a/9WbQtm34FeAYJrKbiTHW6nwpJ8hedt
+YwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/dev/ci/setup-host b/dev/ci/setup-host
index 5de680eb50..425226247c 100755
--- a/dev/ci/setup-host
+++ b/dev/ci/setup-host
@@ -36,16 +36,13 @@ if [ "${GITHUB_ACTIONS:-false}" = "true" ]; then
         if [ "$OS" = "macos" ]; then
             brew update
             brew install ccache
-            # sudo security add-trusted-cert -d -r trustRoot -p codeSign -k /Library/Keychains/System.keychain "$PASSENGER_ROOT/dev/ci/Certificates.cer"
-            # security find-identity -p codesigning /Library/Keychains/System.keychain
-            # security find-identity -v -p codesigning /Library/Keychains/System.keychain
-            # security find-certificate -a /Library/Keychains/System.keychain
-            # security find-certificate -a -c "Developer" /Library/Keychains/System.keychain
-            sudo security import "$PASSENGER_ROOT/dev/ci/Certificates.cer" -k /Library/Keychains/System.keychain -A
+            sudo security authorizationdb write com.apple.trust-settings.admin allow
+            sudo security add-trusted-cert -d -r trustRoot -p codeSign -k /Library/Keychains/System.keychain "$PASSENGER_ROOT/dev/ci/Certificates.cer"
+            sudo security import -A -t priv -k /Library/Keychains/System.keychain "$PASSENGER_ROOT/dev/ci/Developer.key"
+            sudo security import -A -t pub -k /Library/Keychains/System.keychain "$PASSENGER_ROOT/dev/ci/Developer.pub"
+            security find-certificate -a -m -c "Developer" /Library/Keychains/System.keychain
             security find-identity -p codesigning /Library/Keychains/System.keychain
             security find-identity -v -p codesigning /Library/Keychains/System.keychain
-            security find-certificate -a /Library/Keychains/System.keychain
-            security find-certificate -a -c "Developer" /Library/Keychains/System.keychain
         fi
 
 	echo