diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts b/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts index 00efe772caea..5ecb78742d84 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts @@ -54,7 +54,7 @@ let a: ma.TaskLibAnswers = { "/build/temp/ios_signing_temp.keychain": false }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": `MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=${toOpensslString(notBefore)}\nnotAfter=${toOpensslString(notAfter)}\n` }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0FailOnExpiredCertificate.ts b/Tasks/InstallAppleCertificateV2/Tests/L0FailOnExpiredCertificate.ts index 9815aa2bbceb..09481c6cf277 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0FailOnExpiredCertificate.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0FailOnExpiredCertificate.ts @@ -41,7 +41,7 @@ let a: ma.TaskLibAnswers = { "/usr/bin/openssl": true }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": `MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2017 GMT\nnotAfter=${toOpensslString(expiredDate)}\n` } diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts index 42626931332e..bc2fbf559b91 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts @@ -45,7 +45,7 @@ let a: ma.TaskLibAnswers = { "/build/temp/ios_signing_temp.keychain": false }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass: | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass: | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": "MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2018 GMT\nnotAfter=Nov 13 03:37:42 2099 GMT\n" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallDefaultKeychain.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallDefaultKeychain.ts index a0d7d117ebaa..b4386e5df8b6 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallDefaultKeychain.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallDefaultKeychain.ts @@ -41,7 +41,7 @@ let a: ma.TaskLibAnswers = { "/usr/lib/login.keychain": true }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": "MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2018 GMT\nnotAfter=Nov 13 03:37:42 2099 GMT\n" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts index 598a82553828..8d266ac6fb5a 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts @@ -45,7 +45,7 @@ let a: ma.TaskLibAnswers = { "/build/temp/ios_signing_temp.keychain": false }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": "MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2018 GMT\nnotAfter=Nov 13 03:37:42 2099 GMT\n" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychainSkipPartitionIdACL.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychainSkipPartitionIdACL.ts index 59346f11cb62..03e8eebc539a 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychainSkipPartitionIdACL.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychainSkipPartitionIdACL.ts @@ -47,7 +47,7 @@ let a: ma.TaskLibAnswers = { "/build/temp/ios_signing_temp.keychain": true }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": "MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2018 GMT\nnotAfter=Nov 13 03:37:42 2099 GMT\n" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0UserSupplyCN.ts b/Tasks/InstallAppleCertificateV2/Tests/L0UserSupplyCN.ts index 72e5beaf1f77..fa79548082c6 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0UserSupplyCN.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0UserSupplyCN.ts @@ -42,7 +42,7 @@ let a: ma.TaskLibAnswers = { "/usr/lib/login.keychain": true }, "exec": { - "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { + "/usr/bin/openssl pkcs12 -in /build/temp/mySecureFileId.filename -nokeys -passin pass:mycertPwd | /usr/bin/openssl x509 -sha1 -noout -fingerprint -subject -dates -nameopt utf8,sep_semi_plus_space": { "code": 0, "stdout": "MAC verified OK\nSHA1 Fingerprint=BB:26:83:C6:AA:88:35:DE:36:94:F2:CF:37:0A:D4:60:BB:AE:87:0C\nsubject=UID=ZD34QB2EFN; CN=iPhone Developer: Madhuri Gummalla (HE432Y3E2Q); OU=A9M46DL4GH; O=Madhuri Gummalla; C=US\nnotBefore=Nov 13 03:37:42 2018 GMT\nnotAfter=Nov 13 03:37:42 2099 GMT\n" }, diff --git a/Tasks/InstallAppleCertificateV2/package-lock.json b/Tasks/InstallAppleCertificateV2/package-lock.json index 666f3d841a46..50380805d80f 100644 --- a/Tasks/InstallAppleCertificateV2/package-lock.json +++ b/Tasks/InstallAppleCertificateV2/package-lock.json @@ -74,9 +74,9 @@ } }, "azure-pipelines-tasks-ios-signing-common": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-ios-signing-common/-/azure-pipelines-tasks-ios-signing-common-2.0.5.tgz", - "integrity": "sha512-c7b0U/iPay9sWEXFt5VHrVXD516fkslyxv/LA18g0SMkoTafSETvRIr17U1buJiy7OGU+vHeyA+wVO7nfj3IhQ==", + "version": "2.213.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-ios-signing-common/-/azure-pipelines-tasks-ios-signing-common-2.213.0.tgz", + "integrity": "sha512-aXPxOMfLni118tyhZHZy8pJ0cYkRyVGHWwdu/iMPfbRisAt6CULVxGVWWEzhKQYX6E0Uv0pJ1HZ3NH4jY1Yktg==", "requires": { "@types/node": "^10.17.0", "@types/q": "^1.5.4", diff --git a/Tasks/InstallAppleCertificateV2/package.json b/Tasks/InstallAppleCertificateV2/package.json index 2efb57aee196..7ac4fb7d9766 100644 --- a/Tasks/InstallAppleCertificateV2/package.json +++ b/Tasks/InstallAppleCertificateV2/package.json @@ -20,7 +20,7 @@ "@types/node": "^16.11.39", "@types/mocha": "^5.2.7", "azure-pipelines-tasks-securefiles-common": "2.1.0", - "azure-pipelines-tasks-ios-signing-common": "2.0.5", + "azure-pipelines-tasks-ios-signing-common": "2.213.0", "azure-pipelines-task-lib": "^4.0.0-preview" }, "devDependencies": { diff --git a/Tasks/InstallAppleCertificateV2/task.json b/Tasks/InstallAppleCertificateV2/task.json index ab6625314cb8..664995418a99 100644 --- a/Tasks/InstallAppleCertificateV2/task.json +++ b/Tasks/InstallAppleCertificateV2/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 212, + "Minor": 214, "Patch": 0 }, "releaseNotes": "Fixes codesign hangs on a self hosted agent. A Keychain password is now required to use `Default Keychain` or `Custom Keychain`. Microsoft hosted builds should use `Temporary Keychain`.", diff --git a/Tasks/InstallAppleCertificateV2/task.loc.json b/Tasks/InstallAppleCertificateV2/task.loc.json index 1c2c80f23397..b26a2c3f3102 100644 --- a/Tasks/InstallAppleCertificateV2/task.loc.json +++ b/Tasks/InstallAppleCertificateV2/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 212, + "Minor": 214, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", @@ -130,7 +130,7 @@ "Node10": { "target": "preinstallcert.js", "argumentFormat": "" - }, + }, "Node16": { "target": "preinstallcert.js", "argumentFormat": ""