chore: merge to dev-8.x fixes for free and paid timestamping and ocsp services security server ui changes

refs: XRDDEV-2980

Author: Mikk Bachmann

src/security-server/admin-service/application/src/main/java/org/niis/xroad/securityserver/restapi/service/CertificateAuthorityService.java

@@ -42,7 +42,6 @@
 import org.niis.xroad.common.exception.InternalServerErrorException;
 import org.niis.xroad.globalconf.GlobalConfProvider;
 import org.niis.xroad.globalconf.model.ApprovedCAInfo;
-import org.niis.xroad.globalconf.model.CostType;
 import org.niis.xroad.proxy.proto.ProxyRpcClient;
 import org.niis.xroad.restapi.util.FormatUtils;
 import org.niis.xroad.securityserver.restapi.cache.CurrentSecurityServerId;
@@ -213,11 +212,7 @@ private ApprovedCaDto buildCertificateAuthorityDto(
         builder.subjectDnPath(subjectDnPath);
         builder.topCa(subjectDnPath.size() <= 1 && subjectName.equals(subjectDnPath.getFirst()));
 
-        Map<String, CostType> ocspResponderAddressesAndCostTypes = globalConfService.getOcspResponderAddressesAndCostTypes(certificate);
-        ocspResponderAddressesAndCostTypes.put("http://ocsp.int-xroad.net", CostType.FREE); // default OCSP responder
-        ocspResponderAddressesAndCostTypes.put("http://ocsp.int-xroad.net/ocsp2", CostType.PAID); // default OCSP responder
-        ocspResponderAddressesAndCostTypes.put("http://ocsp.int-xroad.net/ocsp3", CostType.UNDEFINED); // default OCSP responder
-        builder.ocspUrlsAndCostTypes(ocspResponderAddressesAndCostTypes);
+        builder.ocspUrlsAndCostTypes(globalConfService.getOcspResponderAddressesAndCostTypes(certificate));
 
         return builder.build();
     }