diff --git a/.github/scripts/run-esrp-signing.py b/.github/scripts/run-esrp-signing.py index f61a97d2582547..725bf4580f5f1b 100644 --- a/.github/scripts/run-esrp-signing.py +++ b/.github/scripts/run-esrp-signing.py @@ -18,10 +18,6 @@ esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe") aad_id = os.environ['AZURE_AAD_ID'].strip() -# We temporarily need two AAD IDs, as we're using an SSL certificate associated -# with an older App Registration until we have the required hardware to approve -# the new certificate in SSL Admin. -aad_id_ssl = os.environ['AZURE_AAD_ID_SSL'].strip() workspace = os.environ['GITHUB_WORKSPACE'].strip() source_location = args.path @@ -36,9 +32,10 @@ "TenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", "ClientId": f"{aad_id}", "AuthCert": { - "SubjectName": f"CN={aad_id_ssl}.microsoft.com", + "SubjectName": f"CN={aad_id}.microsoft.com", "StoreLocation": "LocalMachine", - "StoreName": "My" + "StoreName": "My", + "SendX5c" : "true" }, "RequestSigningCert": { "SubjectName": f"CN={aad_id}", diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 3150ebacb34602..d33b51dc926491 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -402,10 +402,6 @@ jobs: shell: pwsh env: AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }} - # We temporarily need two AAD IDs, as we're using an SSL certificate associated - # with an older App Registration until we have the required hardware to approve - # the new certificate in SSL Admin. - AZURE_AAD_ID_SSL: ${{ secrets.AZURE_AAD_ID_SSL }} APPLE_KEY_CODE: ${{ secrets.APPLE_KEY_CODE }} APPLE_SIGNING_OP_CODE: ${{ secrets.APPLE_SIGNING_OPERATION_CODE }} run: | @@ -514,10 +510,6 @@ jobs: shell: pwsh env: AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }} - # We temporarily need two AAD IDs, as we're using an SSL certificate associated - # with an older App Registration until we have the required hardware to approve - # the new certificate in SSL Admin. - AZURE_AAD_ID_SSL: ${{ secrets.AZURE_AAD_ID_SSL }} APPLE_KEY_CODE: ${{ secrets.APPLE_KEY_CODE }} APPLE_SIGNING_OP_CODE: ${{ secrets.APPLE_SIGNING_OPERATION_CODE }} run: | @@ -534,10 +526,6 @@ jobs: shell: pwsh env: AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }} - # We temporarily need two AAD IDs, as we're using an SSL certificate associated - # with an older App Registration until we have the required hardware to approve - # the new certificate in SSL Admin. - AZURE_AAD_ID_SSL: ${{ secrets.AZURE_AAD_ID_SSL }} APPLE_KEY_CODE: ${{ secrets.APPLE_KEY_CODE }} APPLE_NOTARIZATION_OP_CODE: ${{ secrets.APPLE_NOTARIZATION_OPERATION_CODE }} run: | @@ -691,10 +679,6 @@ jobs: shell: pwsh env: AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }} - # We temporarily need two AAD IDs, as we're using an SSL certificate associated - # with an older App Registration until we have the required hardware to approve - # the new certificate in SSL Admin. - AZURE_AAD_ID_SSL: ${{ secrets.AZURE_AAD_ID_SSL }} LINUX_KEY_CODE: ${{ secrets.LINUX_KEY_CODE }} LINUX_OP_CODE: ${{ secrets.LINUX_OPERATION_CODE }} run: |