Merge pull request #3098 from nordic-institute/develop-to-develop-8.x-19350706577

Merge develop into develop-8.x

Author: mikkbachmann

development/hurl/scenarios/setup.hurl

@@ -538,12 +538,14 @@ HTTP 200
 [Captures]
 tsa_name: jsonpath "$[0].name"
 tsa_url: jsonpath "$[0].url"
+cost_type: jsonpath "$[0].cost_type"
 
 POST https://{{ss0_host}}:4000/api/v1/system/timestamping-services
 X-XSRF-TOKEN: {{ss0_xsrf_token}}
 {
   "name": "{{tsa_name}}",
-  "url": "{{tsa_url}}"
+  "url": "{{tsa_url}}",
+  "cost_type": "{{cost_type}}"
 }
 
 HTTP 201
@@ -787,7 +789,8 @@ POST https://{{ss1_host}}:4000/api/v1/system/timestamping-services
 X-XSRF-TOKEN: {{ss1_xsrf_token}}
 {
   "name": "{{tsa_name}}",
-  "url": "{{tsa_url}}"
+  "url": "{{tsa_url}}",
+  "cost_type": "{{cost_type}}"
 }
 
 HTTP 201

doc/Architecture/spec-al_x-road_audit_log_events.md

@@ -385,7 +385,7 @@ The audit log events related to the system parameters.
 | **Generate certificate request for TLS**      | <ul><li>subjectName - the subject name of the generated certificate request</li></ul>                                                                                                                                                                  |
 | **Import TLS certificate from file**          | <ul><li>certHash - the hash of the generated internal TLS certificate</li><li>certHashAlgorithm - the hash algorithm used to calculate value of the field certHash</li></ul>                                                                           |
 | Upload configuration anchor                   | <ul><li>anchorFileHash - the hash of the uploaded anchor file</li><li>anchorFileHashAlgorithm - the hash algorithm used to calculate value of the field anchorFileHash</li><li>generatedAt - the UTC time when the anchor file was generated</li></ul> |
-| Add timestamping service                      | <ul><li>tspName - the name of the added timestamping service</li><li>tspUrl - the URL of the added timestamping service</li></ul>                                                                                                                      |  
+| Add timestamping service                      | <ul><li>tspName - the name of the added timestamping service</li><li>tspUrl - the URL of the added timestamping service</li><li>tspCostType - the cost type (free or paid) of the added timestamping service</li></ul>                                 |  
 | Delete timestamping service                   | <ul><li>tspName - the name of the deleted timestamping service</li><li>tspUrl - the URL of the deleted timestamping service</li></ul>                                                                                                                  |
 | Generate new internal TLS key and certificate | <ul><li>certHash - the hash of the generated internal TLS certificate</li><li>certHashAlgorithm - the hash algorithm used to calculate value of the field certHash</li></ul>                                                                           |
 

doc/DataModels/dm-ss_x-road_security_server_configuration_data_model.md

@@ -397,12 +397,13 @@ Timestamping service provider (TSP) that is used by the security server to time-
 
 #### 2.14.2 Attributes
 
-| Name        | Type           | Modifiers   | Description      |
-|:----------- |:--------------:|:----------- |:-----------------|
-| id [PK]     | bigint         | NOT NULL    | Primary key.     |
-| conf_id [FK] | bigint |  | Identifies the serverconf. References the id in SERVERCONF table. |
-| name  | character varying(255) |  | The name of the TSP. Used for displaying in the user interface. |
-| url  | character varying(255) | NOT NULL | The URL of the TSP. The security server will send time-stamping request using HTTP POST method.  |
+| Name         |          Type          | Modifiers | Description                                                                                                                         |
+|:-------------|:----------------------:|:----------|:------------------------------------------------------------------------------------------------------------------------------------|
+| id [PK]      |         bigint         | NOT NULL  | Primary key.                                                                                                                        |
+| conf_id [FK] |         bigint         |           | Identifies the serverconf. References the id in SERVERCONF table.                                                                   |
+| name         | character varying(255) |           | The name of the TSP. Used for displaying in the user interface.                                                                     |
+| url          | character varying(255) | NOT NULL  | The URL of the TSP. The security server will send time-stamping request using HTTP POST method.                                     |
+| cost_type    | character varying(255) | NOT NULL  | The cost  type of the TSP, either FREE, PAID or UNDEFINED. Can be used to prioritize the usage of one type of services or the other |
 
 ### 2.15 UIUSER
 

src/central-server/admin-service/ui-system-test/src/intTest/java/org/niis/xroad/cs/test/ui/glue/CommonUiStepDefs.java

@@ -29,8 +29,8 @@
 import io.cucumber.java.After;
 import io.cucumber.java.en.Step;
 import org.openqa.selenium.devtools.DevTools;
-import org.openqa.selenium.devtools.v140.network.Network;
-import org.openqa.selenium.devtools.v140.network.model.ConnectionType;
+import org.openqa.selenium.devtools.v142.network.Network;
+import org.openqa.selenium.devtools.v142.network.model.ConnectionType;
 
 import java.util.Optional;
 
@@ -60,7 +60,7 @@ public void preparePage() {
     @Step("Browser is set in {} network speed")
     public void setInBrowserSpeed(String connectionType) {
         DevTools devTools = chromiumDevTools.getDevTools();
-        devTools.send(Network.enable(empty(), empty(), empty(), empty()));
+        devTools.send(Network.enable(empty(), empty(), empty(), empty(), empty()));
         devTools.send(Network.emulateNetworkConditions(
                 false,
                 350,

src/common/common-admin-api/src/main/java/org/niis/xroad/restapi/config/audit/RestApiAuditProperty.java

@@ -110,6 +110,7 @@ public enum RestApiAuditProperty {
     GENERATED_AT,
     TSP_NAME,
     TSP_URL,
+    TSP_COST_TYPE,
 
     OWNER_IDENTIFIER,
     OWNER_CLASS,

src/common/common-core/src/main/java/ee/ria/xroad/common/ServicePrioritizationStrategy.java

@@ -0,0 +1,36 @@
+/*
+ * The MIT License
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package ee.ria.xroad.common;
+
+public enum ServicePrioritizationStrategy {
+
+    ONLY_FREE,
+    ONLY_PAID,
+    FREE_FIRST,
+    PAID_FIRST,
+    NONE
+
+}

src/common/common-int-test/src/main/resources/META-INF/ca-container/files/home/ca/CA/certs/ca.cert.pem

@@ -1,31 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFRzCCAy+gAwIBAgIUJ9zcm4Tqm5JHAEOzwniCRuwBbvkwDQYJKoZIhvcNAQEL
-BQAwKzEXMBUGA1UECgwOWC1Sb2FkIFRlc3QgQ0ExEDAOBgNVBAMMB1Rlc3QgQ0Ew
-HhcNMjUwMjI3MDgzODQzWhcNNDUwMjIyMDgzODQzWjArMRcwFQYDVQQKDA5YLVJv
-YWQgVGVzdCBDQTEQMA4GA1UEAwwHVGVzdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBALl37rCPYWGAPqnLKKh5ew6f/l/4hU1P2VytOBtm2xS866Ov
-VXsHoXpPn2f8MyByRdPtfPIGSi/8CxQ9oVq9dAGEtwECxh2rtuhvKTgEbToqtepv
-+xMbH2oECnXM9+FBfaEMUeMcAZVlOHeZS+VZULYBUuL/myegz0+arvWGns+r+00X
-9KJDr2Q71rY3ryiA0rfRLYbFuV6zRn4fI7nLxcNrAaxiPdD5muACZvT/lNUrGcMk
-hTi4GOWID5QeYczg32xg9tQbvpqTwtbLYz1x3GLmscJyohJU+POHH11BBseoB+GZ
-JUSX+Cmr6JUPJTz/6BwgMWHH1PgC0acK+kydaVEaMsMLJuE+ULGTcSLb3AvSy0pP
-DTJUr/H30ZXCOprKR3EAd++yfHqWVfR3WssF8fLIVW2yko1g06yuNe/j8gybC5q5
-T/co9mipW3mnBwHlf45gDLfadGvEySjVDQwtDO5B5luUlUH4FAsr+hO6sCh4XJ5W
-XR2D4ssIEWS9gvrK6cZrscsKwHfSGZcIaWce7r09M0cwesfGMa2ITI8U3trRUUtw
-80ppm24NZaZCvw2nLsF2PymjU9eTmLIspzNvpsRI/uEQYu+WcOOLX0jN0S98n5Oc
-j1Dmxsb+D07ax0IMqPfMIck4y6H1Vf7nvt77Huh0/RfTV1+a1wdup1EAdtUNAgMB
-AAGjYzBhMB0GA1UdDgQWBBRjaVM4aiW0a1X+3hWBGs+ai5W/ODAfBgNVHSMEGDAW
-gBRjaVM4aiW0a1X+3hWBGs+ai5W/ODAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEALz1bAWuksoYibdELYBhVVbgU7qle
-1TtRLux38quIRUGdt74u7AG4iMEpygDwcSDlbcPGZslqrpb5LT0h9JyRYDcq/w12
-PGX86GKIZ53XGAv509AuRL6T8EPDCfOo2XMUdCEo2emVrVhbxmvuOcuayqKY7VUA
-TSqrmHVeaFSjoNCXEQ9VQ6u/gWuDYgFNpOeyBsOKPlvsvbyM/6zETjp2pRZBiuJN
-CRD0tx9lOVlaKU7rrk5Lb0NZ3+/YWY6nesSUfF8aHvH5qi2pQ2owQ6fF8AVm2Qr1
-htNtnAUjvsqaPEwFMM99nDU9qcJp6a5SAQInTQYRXEpFdEGVlSrJWVMTcVvAdn7w
-Jtttqx3VS9dfDkYp2mfs0yr7zNoGg26yWkJXMlJ8r7qyjNkcl4c8cmXMcJn0rcja
-phOLUn5vkpJy+CFi+B5aHGoEeSQSGOrmmCSmUMKTTF0KT17pf55Gk+1Yt2cg6SZS
-k5TbtKIx+PID03m8iqyY1zOZ4TpGCIAbN9x6bb0ssl0OCQevVT1wyRYn+O7ie47+
-5Svy/UxcJN/oNxUPl8oWioMtfvqdKxhwsagbx45MgzmRRcYkOif3+2Yo/gORAqVT
-GwyN3Z3SeaiPtBah9OydzSTKiZ1j8tg/o7NZKxx/yFaKF+l10BDo7ZMNpQToedFr
-yK6EeBcQfr5ybXY=
+MIIFMzCCAxugAwIBAgIURfBdux1XmXS0pv/yMruQ1XpPseQwDQYJKoZIhvcNAQEL
+BQAwITENMAsGA1UECgwEVGVzdDEQMA4GA1UEAwwHVGVzdCBDQTAeFw0yNTExMDUy
+MjA5NDBaFw00NTEwMzEyMjA5NDBaMCExDTALBgNVBAoMBFRlc3QxEDAOBgNVBAMM
+B1Rlc3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1OXAZEltW
+mIgiMVghqofO/7fjvwDGmhQbOZH3jDeRuUYC87NktDcuYp9Xu2NNrAdSgjQCU/6I
+tkpLmTMDsTWkOCH++LA4yN7KrBs9+7xOQvaVFx2X7dv9DDbcwMLlCkOtl0kx2BOy
+deOoWp7MoGhEj8Po9JqT15ABfsdnmP5iF6doaGnyhdHLzlL6qEm0df7WatwjkW9n
+Uj3E/HLngOTnpEou4N/w9z+WxcIOrvBy71ITzd7aXfH0DYLBUIGXpSuWA1Ka5Ket
+1R+rO+S9DnoChxvwqJR4XH9l1hBSp21kAjYS0nwND9hgLjWW7LOcjoVPZ+LlrnfI
+BBWnWPr0UaMtDNxubB4AuS4OnRRcZs6ybvs3ELPQs6wEjv4XUrha/4UKzxThHsT2
+1GsXOl/hsEqNMpPVb/UVmnroyaPbYgQlQv16vN+/eeQQzan5qtVhCEW8Q2NOvBUi
+LqjLav/HpU5U6U1BW8K7mGI9WldUUoQ7QRwG79d5VoxHQv9U/4kGMKfEPmuyEdAJ
+pHyZafRoJGJ65R1bVumqWKT9DIB4cxgoidIUlhcaUcIFeLYCIWQ2C6f6Pq4sLHyV
+J7LQyii2YwBEM93B4wLN/buor95LMTXtlebmrziWknnZT4No0+3NO1etf090Vy+2
+mkKhMXeU8I9RKRFIHWwJFV3EqkMtCO2mqQIDAQABo2MwYTAdBgNVHQ4EFgQUUQYm
+HrwLywmv6nvMI5YVhxIajicwHwYDVR0jBBgwFoAUUQYmHrwLywmv6nvMI5YVhxIa
+jicwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBAJJzTBZI/9Sj3XaDkxrUl8Nb9v1odXYxW3g8Q+Sa/LpDwKb55DTtpGoY
+S6D9d0gWENWceC4yT7cUJT9O56w1GT1I3B3CfWVNo73m8L5Ml2TBWIVarF4kJJoJ
+5MUGvtXBZE8s6JjsZcgpRtig229fPztxcpn8R52bvMP3mHzRkhNh+qphjnFr+iqm
+nMW24s7ZF7q029e2kDy3DqOWTxFSmSYhx9qrt4ISC5UhoWLZfoIOShInltFuf3nA
+Ig+XUd3K3TwPikDwWf0E1UpwM9c1pdXY3StJD+KEVIwcjF2+IGjdiGOZ4twQjoG0
+i8h2gzS4e/smLkhGKL49dhVdRFtJk0KxoyjJidEJY0ruIha5rdv9WajHCkdnayJ/
+S7CucjfgWa2fMThqxu+Q89HQf4zhSV6GH4IILDZoEew/07AqhKYz9aLW1/sCd2un
+NEmDhrUfXJ5lZvQQzO5TVh8IfOSVx6DkI0skIq5A8VZuKsMGJ2BuJrt79KUTLHl/
+So4+2NAzxtFVVncTmw4zNmcAha7+ElYd4j8PNnM/qdYy+Z31zA8eZE40uZVAdl44
+cu2cfak2uLtPRRt5TdxcwcldCAjNcN+U7d+VAxvfXL8ZpAx7DRhg6XveJ2Moq9MR
+v2+W4Ds8rBMxa5o4YCwM0qhfZlJE7TjpFLtcP2cNOE9GxKHEoHfI
 -----END CERTIFICATE-----

src/common/common-int-test/src/main/resources/META-INF/ca-container/files/home/ca/CA/certs/ocsp.cert.pem

@@ -1,31 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFSDCCAzCgAwIBAgIBATANBgkqhkiG9w0BAQsFADArMRcwFQYDVQQKDA5YLVJv
-YWQgVGVzdCBDQTEQMA4GA1UEAwwHVGVzdCBDQTAeFw0yNTAyMjcwODM4NDRaFw00
-NTAyMjIwODM4NDRaMC0xFzAVBgNVBAoMDlgtUm9hZCBUZXN0IENBMRIwEAYDVQQD
-DAlUZXN0IE9DU1AwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCXg4Xb
-WIuywlRq3uIIzrxgk8ZWvw1a6hYyu6ghGiL67RRnCGKv9RjwNLOqAxQWAPbDhc2b
-iFvNf07s1sws+a+Nr9/FxBm0fjA96FBhYrJWHR7Te2UpHXkN7S6vkeQnHUevw0k1
-sf92iF1A2wCR5NYwmYhti1/EDy7UAG7Y0lSvCeQo0KKgHXDyATsU62kTgc2mShq1
-95THIgrFgXWDv6gb0P5bRZ45KhyCOgauM9323GH8xg+7WNaGRa3DscOc0lVVkL7Y
-hYj1cokHVU/He6YNf0dRYK6pTI2zwbqjM59Twt9NoC1VvhWLQj9U1O307wWCiDV2
-LpC8Ie7Bas3mR2WVubpISBb8EdW23zngp/FSLHQWopJrdEPhYnj4Vyl84NDvGQV4
-h8ST3f1O9w87C59lsEd9dTQVxWKO7faUVcP0xeJYDENl2/O2ngQlixLHpCZW83X8
-ayIvAr9SRh2HXnjGQSjgZhMwBQpRGTwP2Cu9udwe7SWJaLyPE/I2kyyrUHa4TAkF
-5qLbAohTtNLk9epOXp++cTYbOYszKZQr+zQqP9v94MBitFiz6mDXQhXtTNi1qhbV
-lUTVnDph7rHDj9kr3/DLIG6vnsCEbG3ohrHRrtwd0Rz3V9HAtcNUI3VNNkevR445
-JFh7qxwwfwKLP3vXJcFcE0eG7GhFhiWYEY+1WQIDAQABo3UwczAJBgNVHRMEAjAA
-MB0GA1UdDgQWBBQq+iJWzIxysOagBrC4r+aURQ2AojAfBgNVHSMEGDAWgBRjaVM4
-aiW0a1X+3hWBGs+ai5W/ODAOBgNVHQ8BAf8EBAMCB4AwFgYDVR0lAQH/BAwwCgYI
-KwYBBQUHAwkwDQYJKoZIhvcNAQELBQADggIBAHd1rFVK3I589jMq4Do5yoXm0/xm
-CybKsB1/gHuzqal6/f9MC/Ihoulssf+AbNaYfI9PJksckWdSMEph3jsz8Q7OyH8z
-hNdAeCRm7JmDNZv5+3un2ccC+a6JyJ7P4nxu3OUklrUXG8VlrNCcL+JZ/Cr11PvJ
-sDs4EYGK0D/tlKj0I3Nqn5sV/6wtSfwCDRjpKJ3OldteV9KFxFjdVYTsKkg50Yzc
-pVToxS1sescpCS1rhrtT2PEM+eTxbE+xhxAYhm9an955wC4hY9UWXPwIXIden6Xw
-1HQuYCkHNr/s6gFt/Tzm5uR6xh0UFurA6nNlVJulHpzKsjvBqfI/XBoBem7I0XXr
-qXqlJTbVqW9Fksi0HZRAeha8RIJ0Lfawd2ay34itTdH64+H1KtX3l9H5a24awDlz
-6sEXM8HYsgP00UHs0FZ5JVwAg3SRt3tbhto5hMGKq3yFdOF5P8BYp4Fzj4/ZK1l5
-e3TXiLEFYKbnUmvl1HaioAEJpLol6+JBdBsk8nRRmasN/NuPQR4rNjC4oKjbtovF
-bLlF512Wmu/Dv/UzaaS2l/TkYjVbyXQ06++vyfKtue7bxEHpc2BWGTB6fkUSU96i
-IvpcggZIUiQf9ouOHtEysty1knsibDthXqy++baiGrmzMR+V1x0BVwGOIRhi4fL8
-WFHGKJSHbl38IUiy
+MIIFNDCCAxygAwIBAgIBATANBgkqhkiG9w0BAQsFADAhMQ0wCwYDVQQKDARUZXN0
+MRAwDgYDVQQDDAdUZXN0IENBMB4XDTI1MTEwNTIyMDk0M1oXDTQ1MTAzMTIyMDk0
+M1owIzENMAsGA1UECgwEVGVzdDESMBAGA1UEAwwJVGVzdCBPQ1NQMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAv3BP4uw0wsLFqG38rC6p8bGbOmwoLoZR
+5LX5kW2+99Jdr/nU2ZGPgoHfCpKIR9XVJOMoSwZGDkMkHW2vRi91BPVs9BP1deKU
+rkvgALgkVz1LaBbFNwFtwMylX2C8s3TLGONvsagrEUAdI4SoGvatkaRpNJ1vW6z5
+uKZ5+makUTkW920rMDGloipnVpQDG+IBl2SpLz7UF8xfzjVVycnEWmWAzO4df9Wy
+c9w4UG5Dybf0uok2MKu8PLNlizYzmqokzSYBALX/ycXWydmfKPYhCjj9cBypLGlN
+ivc46GvCYsU44m7v3q/zBlkMJfclF9eoYXWEERlFYu6+/wt/MN0vEbFyDZqrA5B8
+NjyCgx7Un6KDhKdGjtfmI9+Su/22IOybO/lJ9WBh9d/h9hHz2lAkmCY3uV2jq0y9
+M27hf/9D+jqVRvKFjiuWFqvLfM8ZM9gsWlZzZ/ed9LJpEnjjCeG+JdcZaz3a5TuZ
+Pgrjp+4agiO61/B3WZKwK78DVOOd35hkpgpOI41A387MaTLMsEJiGovkJVGLAJWS
+wA2Y1ilyXDfHt1kcfWGGPQQOJtvoVe9F/1TanTdUAtML0g0QoZTuLE1dkMT3iTMI
+iWSptXqF2kG+rIn6W0J8OzRbovvaHE9hWbYK+up6vj7LW/Bde6V5owxSJkIY1xv3
+0WZ1QixfFE0CAwEAAaN1MHMwCQYDVR0TBAIwADAdBgNVHQ4EFgQUExtqj+f/L6sO
+UztcXJjaWUbcFZwwHwYDVR0jBBgwFoAUUQYmHrwLywmv6nvMI5YVhxIajicwDgYD
+VR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEB
+CwUAA4ICAQAuxTQfS/cxw01H27ZSP0vnZ7Oo18H0zlh3OA018popFtJmhEqnVz5E
+zWe/uyVP2/BCNJR2jCFuQDAgtWH+CkDtJWMC5/Dv1NnmMLV1eyPMNG4Xz92hi4/2
++IUK2YefLBtGPEfWTWRpvT74IL6dWLgjDHY+PQGoxcG8sL9SRTND1cOYd2DDGp0r
+ia30zKcb2MlWW1mQNceh+vT6CXEiLao9fTod5cdEANQSsiLP02tDQFKv9LAbRTNH
+Uu8qnaZPj3qpeWrqfUxbxG1WGNa+RUtPjhMewqMmHsRQcSAEVsnjRgOcE1Tj12GX
+X8TxH29AwIJN+RdL8lRY/uN3In87ftjFZ7nCxe8mUk+WQSYce+jU0qt6OcE8ba9m
+TOQizEHnHxqRfcThnuXqRzUGgQ2xH/vhW0bRvA5SIX5w3xA/HMg/uyaaTCIpAyOK
+Dq6vYiOjnUzvtpvbCGMhTy6f9o8JofT6KKbquhajwhDCsOzKIiLVXksSdk9U8Tc3
+xzhkJ5dGcjt/kg+8mZtfJSAstrVJfwRxtfty3uyb7tkoL3yN0aJA7GQSi4Kksj7o
+dFETPkTwU9ItwJLxEA1ATAgLoE5vcS6CjnTZAfmUng19tWhvzcN4rpTaS/8fBKA0
+vIHIXl3Vrbmci2fDD+tWrBwo45iSvjTz1Y5CmDSGS6qo+tgzeZIZpw==
 -----END CERTIFICATE-----

src/common/common-int-test/src/main/resources/META-INF/ca-container/files/home/ca/CA/certs/tsa.cert.pem

@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+P7+kFvR80NJYaVvb2WyFMJGtjsSi10Ipju+fyw==
 -----END CERTIFICATE-----