Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: [AEA-0000] - enable sha256 #2788

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USE_SHA256_PREPARE=false
USE_SHA256_PREPARE=true
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ env:
jobs:
quality_checks:
uses: ./.github/workflows/quality_checks.yml
with:
USE_SHA256_PREPARE: true
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/quality_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: quality checks

on:
workflow_call:
inputs:
USE_SHA256_PREPARE:
type: boolean
required: false
default: true
secrets:
SONAR_TOKEN:
required: true
Expand Down Expand Up @@ -51,6 +56,8 @@ jobs:

- name: run unit tests
run: make test
env:
USE_SHA256_PREPARE: ${{ inputs.USE_SHA256_PREPARE }}

- name: Run cfn-guard
run: make cfn-guard
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ env:
jobs:
quality_checks:
uses: ./.github/workflows/quality_checks.yml
with:
USE_SHA256_PREPARE: true
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export PACT_BROKER_BASIC_AUTH_USERNAME=<SECRET>
export PACT_BROKER_URL=https://nhsd-pact-broker.herokuapp.com
# for api
export SERVICE_BASE_PATH=electronic-prescriptions
export USE_SHA256_PREPARE=false
export USE_SHA256_PREPARE=true
# for epsat
export SERVICE_BASE_PATH=eps-api-tool
export PACT_VERSION="$SERVICE_BASE_PATH"
Expand Down
2 changes: 1 addition & 1 deletion azure/azure-build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ extends:
- bash: "make check-language-versions"
displayName: Check consistent language version
workingDirectory: "${{ variables.service_name }}"
- bash: "make test"
- bash: "USE_SHA256_PREPARE=true make test"
displayName: Run Quality Checks
workingDirectory: "${{ variables.service_name }}"
- task: PublishTestResults@2
Expand Down
2 changes: 2 additions & 0 deletions azure/templates/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ steps:
export API_CLIENT_ID=$(API_CLIENT_ID)
export API_CLIENT_SECRET=$(API_CLIENT_SECRET)
export APIGEE_ACCESS_TOKEN=$(APIGEE_ACCESS_TOKEN)
export USE_SHA256_PREPARE=true

cd packages/e2e-tests

Expand All @@ -215,6 +216,7 @@ steps:
export API_CLIENT_ID=$(API_CLIENT_ID)
export API_CLIENT_SECRET=$(API_CLIENT_SECRET)
export APIGEE_ACCESS_TOKEN=$(APIGEE_ACCESS_TOKEN)
export USE_SHA256_PREPARE=true

cd packages/e2e-tests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<Reference>
<Transforms>
<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<DigestValue>eANp1umypWclOsdQMGkTRAkn08Y=</DigestValue>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>ggI35xNmJ9hkNp/32gr77qyN40s3AVWMdlfEHVrcPX0=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>b1eTaYQWVadt+erMU80uu/oMao1DMEV0tiQyPojUr54ynnwRcuXEVpZl2evjjO3Sl442yaYxHQusTVz4rMCzEMuf3UUMTGx0mW8SJi/OQFI9LjdEFPB4qVmUgT2d84LIya0xnxXCAJXmeZ0jame3bsfjwbFyEskrobXnrMmml9s=</SignatureValue>
<SignatureValue>V5FsXPsR/ZPLiG6e0fvMvK5xvJyhgbLus9zGn9RFh4OxXjp5PO1w0RwyHTqoTUMYyTqu0/iC8+U6FNzPyc6F3hKkrBynZ2KqO3HddSvYR2YC46jK2z3NRllezwQOhqTtb7WxWgJF/5Wuv0sGPCTUrZ1qCme8/WBk759Z/NcoOtPYE1jwTLsc+9LLYiOD8vfuCxft5WW7m9Mz2hXksT98RkyeQKEGWHvGyNyVyluisVRHqFDM+YOyVCAETubXFi+IWlIhHEANRDCF8kmjyectmd7VZxFT4wsg7IWJpeQssFYcsZhhSD9+6K6l3/8xxHZm0GP1R0FlBdjwBysk9wD+OA==</SignatureValue>
<KeyInfo>
<X509Data>
<X509Certificate>MIIDuDCCAqCgAwIBAgIEXcmtHzANBgkqhkiG9w0BAQsFADA2MQwwCgYDVQQKEwNuaHMxCzAJBgNVBAsTAkNBMRkwFwYDVQQDExBOSFMgSU5UIExldmVsIDFEMB4XDTIwMTAyMjEwMjE1NVoXDTIyMTAyMjEwNTE1NVowQzEMMAoGA1UEChMDbmhzMQ8wDQYDVQQLEwZQZW9wbGUxIjAgBgNVBAMMGTU1NTI1MzUyMTEwOF9SQU5ET01fVVNFUlEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKt4szNw7OAH7AQRrDe/xBImsMmMiS9EsrT3a3p/Lh3brdzI9aajTUZ2b/cvbOa7PeYd7u+K4a2Zd0Xk+0GFmYGzSVX6iYjblwr0vai31zV7G+lGvHxH6pSoLCwICaZAFwabeD5Oz94+yA3aWNWtGV0Dfh9qwH3ZFCIMRsverN1pAgMBAAGjggFDMIIBPzAOBgNVHQ8BAf8EBAMCBkAwZQYDVR0gAQH/BFswWTBXBgsqhjoAiXtmAAMCADBIMEYGCCsGAQUFBwIBFjpodHRwczovL3BraS5uaHMudWsvY2VydGlmaWNhdGVfcG9saWNpZXMvY29udGVudF9jb21taXRtZW50MDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwubmhzLnVrL2ludC8xZC9jcmxjMy5jcmwwKwYDVR0QBCQwIoAPMjAyMDEwMjIxMDIxNTVagQ8yMDIyMDMxNzEwNTE1NVowHwYDVR0jBBgwFoAUoJYfgYTNPd6EUKL6QLIzHxY5PFIwHQYDVR0OBBYEFLtyvYSyaqg60AEUZgxk0wrjRJc+MAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjguMwMCBLAwDQYJKoZIhvcNAQELBQADggEBABczy8B8juPpIfaTNFcxrC22aCX/xYZmhrL/NvIBAaX1G5hjiwmkGKE2hRTIr67PxZxmXsJxigRBMHPlI+lY/+okzH0Gi7b5bqlw7pxGIgJO000w8pFsvo9w42IYhHodsvnDVSxhMT0J46Qhk9soE0LjoEULKQPPlYGke/Gl3m17ItFYwObQH0fMEwmiqByeIfz7gSccOzL5cIp6PcZTOjo2IqQpgEmhjOcRInEqANitSdjoiJAJzpaaZjYTRdHUX7i7ajEiH4m91nFW+4AqkNttlb4WcGKsSmWgfKKheF4IoZKME80xerSgMy8vtjLOBJCGXz0wLGmQuRmxMTq88q4=</X509Certificate>
<X509Certificate>MIIE2zCCA8OgAwIBAgIQc/EflNnUNzjftAJJWhATlTANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJHQjEMMAoGA1UEChMDbmhzMQswCQYDVQQLEwJDQTEbMBkGA1UEAxMSTkhTIElOVCBTaWduaW5nIEcyMB4XDTIzMDMxNjE2MDgzN1oXDTI1MDMxNjE2MzgzN1owajELMAkGA1UEBhMCR0IxDDAKBgNVBAoTA25oczELMAkGA1UECxMCQ0ExGzAZBgNVBAMTEk5IUyBJTlQgU2lnbmluZyBHMjEjMCEGA1UEAwwaNzg3ODA3NDI5NTExIHJlZl90ZXN0X2NlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGfxjm5QPugxP5xpzICAx8M/fqanbMPJ0Rhzs1BrVkLcIZ6sA18mdXNCwPdT+JybRnUlsLW1qLyvDyNG1ZlB6QOz5qQjHNmt+tDWbyctkuNk2NGmDV/SBtgokz4QM2EzyDb03udxYWea0oAieN+Tzx0Ev4kCR0D+O8BGp9E3C5YHL1wqcyQttp/fEu0u6wxOsTW3VawBry4MxC2mqfMaKF+ZsktZCEwgZ0O5EIZO31TxLCoXdGPKZaR83VTtI4WkfPFeqocP0vvLWkDkOJsDCegR0CUJGFI5UkVmcNEYcsXX+3E4lTQuhRUM1vgMaiQ6HFLRwBEodyAZJiAJlujxqTAgMBAAGjggGgMIIBnDAOBgNVHQ8BAf8EBAMCBkAwQQYDVR0gAQH/BDcwNTAzBgsqhjoAiXtmAAMCADAkMCIGCCsGAQUFBwIBFhZodHRwczovL3BraS5uaHMudWsvQ1BTMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubmhzLnVrL29jc3AwOgYIKwYBBQUHMAKGLmh0dHA6Ly9wa2kubmhzLnVrL2ludC9HMi9zaWduL05IU0lOVFNpZ25HMi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5uaHMudWsvaW50L2cyL3NpZ24vTkhTSU5Uc2lnbkcyX2M0LmNybDArBgNVHRAEJDAigA8yMDIzMDMxNjE2MDgzN1qBDzIwMjUwMzE2MTYzODM3WjAfBgNVHSMEGDAWgBSC+0pvCXGNKbY4bF/C3S/Ou3pu3DAdBgNVHQ4EFgQU5pmR1xpVza6v5mdIjKekFx+hnKMwCQYDVR0TBAIwADAaBgkqhkiG9n0HQQAEDTALGwVWMTAuMAMCBLAwDQYJKoZIhvcNAQELBQADggEBAIrv8EjU7HaE96Xg6F7eJiWORG7wb/h77/dQgwR3wZwLV7P8mdCGExTiHahoLQQ4sxeaAawGgJj248r8lUmMrbb9iZlRLVAqJi3xACIen0MXZbbNsdggw09NW+yRou9hZoF7X/p1GXaqphpPhqe9J7Q5M15EOoteznvE1rKEwDs2I0XRkt58XJJXQg2mcnuvJIdqm8PWrOucm8S2LR23PLH8KfRYRnM1Sz2YJlTtFQx21yfzPCAt/FbrXPO6c2TuqDz3acOtQRTQg9vu6eTBdrWzPO25NTrdITs2acYpNM7l8opQmd80tCzspbviwoZMbkNadVx9hP56zI+yHG8Pmbs=</X509Certificate>
</X509Data>
</KeyInfo>
</Signature>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"parameter": [
{
"name": "digest",
"valueString": "PFNpZ25lZEluZm8geG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiPjxDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIj48L0Nhbm9uaWNhbGl6YXRpb25NZXRob2Q+PFNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNyc2Etc2hhMSI+PC9TaWduYXR1cmVNZXRob2Q+PFJlZmVyZW5jZT48VHJhbnNmb3Jtcz48VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIj48L1RyYW5zZm9ybT48L1RyYW5zZm9ybXM+PERpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNzaGExIj48L0RpZ2VzdE1ldGhvZD48RGlnZXN0VmFsdWU+bkIwMUZJUG1yMVM4TVMveDVoYVk4U3dpT1Y4PTwvRGlnZXN0VmFsdWU+PC9SZWZlcmVuY2U+PC9TaWduZWRJbmZvPg=="
"valueString": "PFNpZ25lZEluZm8geG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiPjxDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIj48L0Nhbm9uaWNhbGl6YXRpb25NZXRob2Q+PFNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiPjwvU2lnbmF0dXJlTWV0aG9kPjxSZWZlcmVuY2U+PFRyYW5zZm9ybXM+PFRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyI+PC9UcmFuc2Zvcm0+PC9UcmFuc2Zvcm1zPjxEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiPjwvRGlnZXN0TWV0aG9kPjxEaWdlc3RWYWx1ZT5Pd3Z6S3dlaHZZVC90ZzdlQUV4UjVUR0ZkQ1NTaW51THBDaWFOcnZIMEtvPTwvRGlnZXN0VmFsdWU+PC9SZWZlcmVuY2U+PC9TaWduZWRJbmZvPg=="
},
{
"name": "timestamp",
"valueString": "2022-10-25T10:24:34+00:00"
"valueString": "2024-08-13T09:21:58+00:00"
},
{
"name": "algorithm",
"valueString": "RS1"
"valueString": "RS256"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@
"who": {
"reference": "urn:uuid:56166769-c1c4-4d07-afa8-132b5dfca666"
},
"data": "DQo8U2lnbmF0dXJlIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj4NCiAgICA8U2lnbmVkSW5mbz48Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyI+PC9DYW5vbmljYWxpemF0aW9uTWV0aG9kPjxTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjcnNhLXNoYTEiPjwvU2lnbmF0dXJlTWV0aG9kPjxSZWZlcmVuY2U+PFRyYW5zZm9ybXM+PFRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyI+PC9UcmFuc2Zvcm0+PC9UcmFuc2Zvcm1zPjxEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjc2hhMSI+PC9EaWdlc3RNZXRob2Q+PERpZ2VzdFZhbHVlPmVBTnAxdW15cFdjbE9zZFFNR2tUUkFrbjA4WT08L0RpZ2VzdFZhbHVlPjwvUmVmZXJlbmNlPjwvU2lnbmVkSW5mbz4NCiAgICA8U2lnbmF0dXJlVmFsdWU+YjFlVGFZUVdWYWR0K2VyTVU4MHV1L29NYW8xRE1FVjB0aVF5UG9qVXI1NHlubndSY3VYRVZwWmwyZXZqak8zU2w0NDJ5YVl4SFF1c1RWejRyTUN6RU11ZjNVVU1UR3gwbVc4U0ppL09RRkk5TGpkRUZQQjRxVm1VZ1QyZDg0TEl5YTB4bnhYQ0FKWG1lWjBqYW1lM2JzZmp3YkZ5RXNrcm9iWG5yTW1tbDlzPTwvU2lnbmF0dXJlVmFsdWU+DQogICAgPEtleUluZm8+DQogICAgICAgIDxYNTA5RGF0YT4NCiAgICAgICAgICAgIDxYNTA5Q2VydGlmaWNhdGU+TUlJRHVEQ0NBcUNnQXdJQkFnSUVYY210SHpBTkJna3Foa2lHOXcwQkFRc0ZBREEyTVF3d0NnWURWUVFLRXdOdWFITXhDekFKQmdOVkJBc1RBa05CTVJrd0Z3WURWUVFERXhCT1NGTWdTVTVVSUV4bGRtVnNJREZFTUI0WERUSXdNVEF5TWpFd01qRTFOVm9YRFRJeU1UQXlNakV3TlRFMU5Wb3dRekVNTUFvR0ExVUVDaE1EYm1oek1ROHdEUVlEVlFRTEV3WlFaVzl3YkdVeElqQWdCZ05WQkFNTUdUVTFOVEkxTXpVeU1URXdPRjlTUVU1RVQwMWZWVk5GVWxFd2daOHdEUVlKS29aSWh2Y05BUUVCQlFBRGdZMEFNSUdKQW9HQkFLdDRzek53N09BSDdBUVJyRGUveEJJbXNNbU1pUzlFc3JUM2EzcC9MaDNicmR6STlhYWpUVVoyYi9jdmJPYTdQZVlkN3UrSzRhMlpkMFhrKzBHRm1ZR3pTVlg2aVlqYmx3cjB2YWkzMXpWN0crbEd2SHhINnBTb0xDd0lDYVpBRndhYmVENU96OTQreUEzYVdOV3RHVjBEZmg5cXdIM1pGQ0lNUnN2ZXJOMXBBZ01CQUFHamdnRkRNSUlCUHpBT0JnTlZIUThCQWY4RUJBTUNCa0F3WlFZRFZSMGdBUUgvQkZzd1dUQlhCZ3NxaGpvQWlYdG1BQU1DQURCSU1FWUdDQ3NHQVFVRkJ3SUJGanBvZEhSd2N6b3ZMM0JyYVM1dWFITXVkV3N2WTJWeWRHbG1hV05oZEdWZmNHOXNhV05wWlhNdlkyOXVkR1Z1ZEY5amIyMXRhWFJ0Wlc1ME1ETUdBMVVkSHdRc01Db3dLS0Ftb0NTR0ltaDBkSEE2THk5amNtd3VibWh6TG5WckwybHVkQzh4WkM5amNteGpNeTVqY213d0t3WURWUjBRQkNRd0lvQVBNakF5TURFd01qSXhNREl4TlRWYWdROHlNREl5TURNeE56RXdOVEUxTlZvd0h3WURWUjBqQkJnd0ZvQVVvSllmZ1lUTlBkNkVVS0w2UUxJekh4WTVQRkl3SFFZRFZSME9CQllFRkx0eXZZU3lhcWc2MEFFVVpneGswd3JqUkpjK01Ba0dBMVVkRXdRQ01BQXdHUVlKS29aSWh2WjlCMEVBQkF3d0Noc0VWamd1TXdNQ0JMQXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQmN6eThCOGp1UHBJZmFUTkZjeHJDMjJhQ1gveFlabWhyTC9OdklCQWFYMUc1aGppd21rR0tFMmhSVElyNjdQeFp4bVhzSnhpZ1JCTUhQbEkrbFkvK29rekgwR2k3YjVicWx3N3B4R0lnSk8wMDB3OHBGc3ZvOXc0MklZaEhvZHN2bkRWU3hoTVQwSjQ2UWhrOXNvRTBMam9FVUxLUVBQbFlHa2UvR2wzbTE3SXRGWXdPYlFIMGZNRXdtaXFCeWVJZno3Z1NjY096TDVjSXA2UGNaVE9qbzJJcVFwZ0VtaGpPY1JJbkVxQU5pdFNkam9pSkFKenBhYVpqWVRSZEhVWDdpN2FqRWlING05MW5GVys0QXFrTnR0bGI0V2NHS3NTbVdnZktLaGVGNElvWktNRTgweGVyU2dNeTh2dGpMT0JKQ0dYejB3TEdtUXVSbXhNVHE4OHE0PTwvWDUwOUNlcnRpZmljYXRlPg0KICAgICAgICA8L1g1MDlEYXRhPg0KICAgIDwvS2V5SW5mbz4NCjwvU2lnbmF0dXJlPg0K"
"data": "CjxTaWduYXR1cmUgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyMiPgogIDxTaWduZWRJbmZvPjxDYW5vbmljYWxpemF0aW9uTWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS8xMC94bWwtZXhjLWMxNG4jIj48L0Nhbm9uaWNhbGl6YXRpb25NZXRob2Q+PFNpZ25hdHVyZU1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMDQveG1sZHNpZy1tb3JlI3JzYS1zaGEyNTYiPjwvU2lnbmF0dXJlTWV0aG9kPjxSZWZlcmVuY2U+PFRyYW5zZm9ybXM+PFRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyI+PC9UcmFuc2Zvcm0+PC9UcmFuc2Zvcm1zPjxEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNzaGEyNTYiPjwvRGlnZXN0TWV0aG9kPjxEaWdlc3RWYWx1ZT5nZ0kzNXhObUo5aGtOcC8zMmdyNzdxeU40MHMzQVZXTWRsZkVIVnJjUFgwPTwvRGlnZXN0VmFsdWU+PC9SZWZlcmVuY2U+PC9TaWduZWRJbmZvPgogIDxTaWduYXR1cmVWYWx1ZT5WNUZzWFBzUi9aUExpRzZlMGZ2TXZLNXh2SnloZ2JMdXM5ekduOVJGaDRPeFhqcDVQTzF3MFJ3eUhUcW9UVU1ZeVRxdTAvaUM4K1U2Rk56UHljNkYzaEtrckJ5bloyS3FPM0hkZFN2WVIyWUM0NmpLMnozTlJsbGV6d1FPaHFUdGI3V3hXZ0pGLzVXdXYwc0dQQ1RVcloxcUNtZTgvV0JrNzU5Wi9OY29PdFBZRTFqd1RMc2MrOUxMWWlPRDh2ZnVDeGZ0NVdXN205TXoyaFhrc1Q5OFJreWVRS0VHV0h2R3lOeVZ5bHVpc1ZSSHFGRE0rWU95VkNBRVR1YlhGaStJV2xJaEhFQU5SRENGOGttanllY3RtZDdWWnhGVDR3c2c3SVdKcGVRc3NGWWNzWmhoU0Q5KzZLNmwzLzh4eEhabTBHUDFSMEZsQmRqd0J5c2s5d0QrT0E9PTwvU2lnbmF0dXJlVmFsdWU+CiAgPEtleUluZm8+CiAgICAgIDxYNTA5RGF0YT4KICAgICAgICAgIDxYNTA5Q2VydGlmaWNhdGU+TUlJRTJ6Q0NBOE9nQXdJQkFnSVFjL0VmbE5uVU56amZ0QUpKV2hBVGxUQU5CZ2txaGtpRzl3MEJBUXNGQURCRk1Rc3dDUVlEVlFRR0V3SkhRakVNTUFvR0ExVUVDaE1EYm1oek1Rc3dDUVlEVlFRTEV3SkRRVEViTUJrR0ExVUVBeE1TVGtoVElFbE9WQ0JUYVdkdWFXNW5JRWN5TUI0WERUSXpNRE14TmpFMk1EZ3pOMW9YRFRJMU1ETXhOakUyTXpnek4xb3dhakVMTUFrR0ExVUVCaE1DUjBJeEREQUtCZ05WQkFvVEEyNW9jekVMTUFrR0ExVUVDeE1DUTBFeEd6QVpCZ05WQkFNVEVrNUlVeUJKVGxRZ1UybG5ibWx1WnlCSE1qRWpNQ0VHQTFVRUF3d2FOemczT0RBM05ESTVOVEV4SUhKbFpsOTBaWE4wWDJObGNuUXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFER2Z4am01UVB1Z3hQNXhweklDQXg4TS9mcWFuYk1QSjBSaHpzMUJyVmtMY0laNnNBMThtZFhOQ3dQZFQrSnliUm5VbHNMVzFxTHl2RHlORzFabEI2UU96NXFRakhObXQrdERXYnljdGt1TmsyTkdtRFYvU0J0Z29rejRRTTJFenlEYjAzdWR4WVdlYTBvQWllTitUengwRXY0a0NSMEQrTzhCR3A5RTNDNVlITDF3cWN5UXR0cC9mRXUwdTZ3eE9zVFczVmF3QnJ5NE14QzJtcWZNYUtGK1pza3RaQ0V3Z1owTzVFSVpPMzFUeExDb1hkR1BLWmFSODNWVHRJNFdrZlBGZXFvY1AwdnZMV2tEa09Kc0RDZWdSMENVSkdGSTVVa1ZtY05FWWNzWFgrM0U0bFRRdWhSVU0xdmdNYWlRNkhGTFJ3QkVvZHlBWkppQUpsdWp4cVRBZ01CQUFHamdnR2dNSUlCbkRBT0JnTlZIUThCQWY4RUJBTUNCa0F3UVFZRFZSMGdBUUgvQkRjd05UQXpCZ3NxaGpvQWlYdG1BQU1DQURBa01DSUdDQ3NHQVFVRkJ3SUJGaFpvZEhSd2N6b3ZMM0JyYVM1dWFITXVkV3N2UTFCVE1HOEdDQ3NHQVFVRkJ3RUJCR013WVRBakJnZ3JCZ0VGQlFjd0FZWVhhSFIwY0RvdkwyOWpjM0F1Ym1oekxuVnJMMjlqYzNBd09nWUlLd1lCQlFVSE1BS0dMbWgwZEhBNkx5OXdhMmt1Ym1oekxuVnJMMmx1ZEM5SE1pOXphV2R1TDA1SVUwbE9WRk5wWjI1SE1pNWpjblF3UWdZRFZSMGZCRHN3T1RBM29EV2dNNFl4YUhSMGNEb3ZMMk55YkM1dWFITXVkV3N2YVc1MEwyY3lMM05wWjI0dlRraFRTVTVVYzJsbmJrY3lYMk0wTG1OeWJEQXJCZ05WSFJBRUpEQWlnQTh5TURJek1ETXhOakUyTURnek4xcUJEekl3TWpVd016RTJNVFl6T0RNM1dqQWZCZ05WSFNNRUdEQVdnQlNDKzBwdkNYR05LYlk0YkYvQzNTL091M3B1M0RBZEJnTlZIUTRFRmdRVTVwbVIxeHBWemE2djVtZElqS2VrRngraG5LTXdDUVlEVlIwVEJBSXdBREFhQmdrcWhraUc5bjBIUVFBRURUQUxHd1ZXTVRBdU1BTUNCTEF3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUlydjhFalU3SGFFOTZYZzZGN2VKaVdPUkc3d2IvaDc3L2RRZ3dSM3dad0xWN1A4bWRDR0V4VGlIYWhvTFFRNHN4ZWFBYXdHZ0pqMjQ4cjhsVW1NcmJiOWlabFJMVkFxSmkzeEFDSWVuME1YWmJiTnNkZ2d3MDlOVyt5Um91OWhab0Y3WC9wMUdYYXFwaHBQaHFlOUo3UTVNMTVFT290ZXpudkUxcktFd0RzMkkwWFJrdDU4WEpKWFFnMm1jbnV2SklkcW04UFdyT3VjbThTMkxSMjNQTEg4S2ZSWVJuTTFTejJZSmxUdEZReDIxeWZ6UENBdC9GYnJYUE82YzJUdXFEejNhY090UVJUUWc5dnU2ZVRCZHJXelBPMjVOVHJkSVRzMmFjWXBOTTdsOG9wUW1kODB0Q3pzcGJ2aXdvWk1ia05hZFZ4OWhQNTZ6SSt5SEc4UG1icz08L1g1MDlDZXJ0aWZpY2F0ZT4KICAgICAgPC9YNTA5RGF0YT4KICA8L0tleUluZm8+CjwvU2lnbmF0dXJlPgo="
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,19 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<Reference>
<Transforms>
<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<DigestValue>eYCvlqvgpiReMn+pQj8784F2bL8=</DigestValue>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>eTcJSG078+3mfVzfhDvEdlZrCVKwW3Z8VmUb0+30LJE=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>FbOZdICsiodJz6eh4kg/vFuvEmG/d368wjncMLrabqem168R6GUsFGMtJONObY7sEYUvQCqctO5JlwiN7Zomx7WEk8X0/gTUbGepdbTQ3zzuuhGolV5xWuncy/jH7751zwBg7xKTnQtHY33HJ55feS7RImDLnfAdznfEbtU6La4=</SignatureValue>
<SignatureValue>nQzG2JWojGZIFvNSxyudjrzG69wLJXG6XStWq8D4h0p+aCL2nLnieS7X/b2wgpRMucmV8lXbodlpgCpEGwwYVteawAU0kVQ5HGRWpllc3bphxwXZquC5dCO7U63chA+ma9DKHux9AO7u3zpxHa4tZC8LXFJgjPZv1aTZbY5vJktHduMdBTvPL8jmpSA0HOH37+RV8fO98BUHqlXwMg0k5Ct64auo6PI8Kp1d3gBF/3APFub1HsK9fga3/mxVXoAq8G9Yreko7xxDq85s/sYJBkFdLDdAIsWMCadbrWtBFNo1WeuEEURGN/eKQ2ug2zTnoVHSJwzrSDn0v26eJAs6bA==</SignatureValue>
<KeyInfo>
<X509Data>
<X509Certificate>MIIDuDCCAqCgAwIBAgIEXcmtHzANBgkqhkiG9w0BAQsFADA2MQwwCgYDVQQKEwNuaHMxCzAJBgNVBAsTAkNBMRkwFwYDVQQDExBOSFMgSU5UIExldmVsIDFEMB4XDTIwMTAyMjEwMjE1NVoXDTIyMTAyMjEwNTE1NVowQzEMMAoGA1UEChMDbmhzMQ8wDQYDVQQLEwZQZW9wbGUxIjAgBgNVBAMMGTU1NTI1MzUyMTEwOF9SQU5ET01fVVNFUlEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKt4szNw7OAH7AQRrDe/xBImsMmMiS9EsrT3a3p/Lh3brdzI9aajTUZ2b/cvbOa7PeYd7u+K4a2Zd0Xk+0GFmYGzSVX6iYjblwr0vai31zV7G+lGvHxH6pSoLCwICaZAFwabeD5Oz94+yA3aWNWtGV0Dfh9qwH3ZFCIMRsverN1pAgMBAAGjggFDMIIBPzAOBgNVHQ8BAf8EBAMCBkAwZQYDVR0gAQH/BFswWTBXBgsqhjoAiXtmAAMCADBIMEYGCCsGAQUFBwIBFjpodHRwczovL3BraS5uaHMudWsvY2VydGlmaWNhdGVfcG9saWNpZXMvY29udGVudF9jb21taXRtZW50MDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwubmhzLnVrL2ludC8xZC9jcmxjMy5jcmwwKwYDVR0QBCQwIoAPMjAyMDEwMjIxMDIxNTVagQ8yMDIyMDMxNzEwNTE1NVowHwYDVR0jBBgwFoAUoJYfgYTNPd6EUKL6QLIzHxY5PFIwHQYDVR0OBBYEFLtyvYSyaqg60AEUZgxk0wrjRJc+MAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjguMwMCBLAwDQYJKoZIhvcNAQELBQADggEBABczy8B8juPpIfaTNFcxrC22aCX/xYZmhrL/NvIBAaX1G5hjiwmkGKE2hRTIr67PxZxmXsJxigRBMHPlI+lY/+okzH0Gi7b5bqlw7pxGIgJO000w8pFsvo9w42IYhHodsvnDVSxhMT0J46Qhk9soE0LjoEULKQPPlYGke/Gl3m17ItFYwObQH0fMEwmiqByeIfz7gSccOzL5cIp6PcZTOjo2IqQpgEmhjOcRInEqANitSdjoiJAJzpaaZjYTRdHUX7i7ajEiH4m91nFW+4AqkNttlb4WcGKsSmWgfKKheF4IoZKME80xerSgMy8vtjLOBJCGXz0wLGmQuRmxMTq88q4=</X509Certificate>
<X509Certificate>MIIE2zCCA8OgAwIBAgIQc/EflNnUNzjftAJJWhATlTANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJHQjEMMAoGA1UEChMDbmhzMQswCQYDVQQLEwJDQTEbMBkGA1UEAxMSTkhTIElOVCBTaWduaW5nIEcyMB4XDTIzMDMxNjE2MDgzN1oXDTI1MDMxNjE2MzgzN1owajELMAkGA1UEBhMCR0IxDDAKBgNVBAoTA25oczELMAkGA1UECxMCQ0ExGzAZBgNVBAMTEk5IUyBJTlQgU2lnbmluZyBHMjEjMCEGA1UEAwwaNzg3ODA3NDI5NTExIHJlZl90ZXN0X2NlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGfxjm5QPugxP5xpzICAx8M/fqanbMPJ0Rhzs1BrVkLcIZ6sA18mdXNCwPdT+JybRnUlsLW1qLyvDyNG1ZlB6QOz5qQjHNmt+tDWbyctkuNk2NGmDV/SBtgokz4QM2EzyDb03udxYWea0oAieN+Tzx0Ev4kCR0D+O8BGp9E3C5YHL1wqcyQttp/fEu0u6wxOsTW3VawBry4MxC2mqfMaKF+ZsktZCEwgZ0O5EIZO31TxLCoXdGPKZaR83VTtI4WkfPFeqocP0vvLWkDkOJsDCegR0CUJGFI5UkVmcNEYcsXX+3E4lTQuhRUM1vgMaiQ6HFLRwBEodyAZJiAJlujxqTAgMBAAGjggGgMIIBnDAOBgNVHQ8BAf8EBAMCBkAwQQYDVR0gAQH/BDcwNTAzBgsqhjoAiXtmAAMCADAkMCIGCCsGAQUFBwIBFhZodHRwczovL3BraS5uaHMudWsvQ1BTMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubmhzLnVrL29jc3AwOgYIKwYBBQUHMAKGLmh0dHA6Ly9wa2kubmhzLnVrL2ludC9HMi9zaWduL05IU0lOVFNpZ25HMi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5uaHMudWsvaW50L2cyL3NpZ24vTkhTSU5Uc2lnbkcyX2M0LmNybDArBgNVHRAEJDAigA8yMDIzMDMxNjE2MDgzN1qBDzIwMjUwMzE2MTYzODM3WjAfBgNVHSMEGDAWgBSC+0pvCXGNKbY4bF/C3S/Ou3pu3DAdBgNVHQ4EFgQU5pmR1xpVza6v5mdIjKekFx+hnKMwCQYDVR0TBAIwADAaBgkqhkiG9n0HQQAEDTALGwVWMTAuMAMCBLAwDQYJKoZIhvcNAQELBQADggEBAIrv8EjU7HaE96Xg6F7eJiWORG7wb/h77/dQgwR3wZwLV7P8mdCGExTiHahoLQQ4sxeaAawGgJj248r8lUmMrbb9iZlRLVAqJi3xACIen0MXZbbNsdggw09NW+yRou9hZoF7X/p1GXaqphpPhqe9J7Q5M15EOoteznvE1rKEwDs2I0XRkt58XJJXQg2mcnuvJIdqm8PWrOucm8S2LR23PLH8KfRYRnM1Sz2YJlTtFQx21yfzPCAt/FbrXPO6c2TuqDz3acOtQRTQg9vu6eTBdrWzPO25NTrdITs2acYpNM7l8opQmd80tCzspbviwoZMbkNadVx9hP56zI+yHG8Pmbs=</X509Certificate>
</X509Data>
</KeyInfo>
</Signature>
Expand Down
Loading