Revize ea1229ee

Re #8576 - Fix of specifying CRL and OCSP endpoint

src/services/certificate_service.py

@@ -51 +51 @@
             usages = {}
 
         cert_id = self.certificate_repository.get_next_id()
-        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(cert_id)
-        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(cert_id)
 
         # create a new self signed  certificate
         cert_pem = self.cryptography_service.create_sscrt(subject, key.private_key, key_pass=key.password,
@@ -116 +114 @@
         extensions = extensions + "\n" + CA_EXTENSIONS
         # Add CRL and OCSP distribution point to certificate extensions
         cert_id = self.certificate_repository.get_next_id()
-        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(cert_id)
-        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(cert_id)
+        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(issuer_cert.certificate_id)
+        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(issuer_cert.certificate_id)
 
         # TODO implement AIA URI via extensions
         cert_pem = self.cryptography_service.create_crt(subject, subject_key.private_key, issuer_cert.pem_data,
@@ -176 +174 @@
         # get the next certificate ID in order to be able to specify the serial number
         cert_id = self.certificate_repository.get_next_id()
 
+        # Add CRL and OCSP distribution point to certificate extensions
+        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(issuer_cert.certificate_id)
+        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(issuer_cert.certificate_id)
+
         # generate a new certificate
         cert_pem = self.cryptography_service.create_crt(subject, subject_key.private_key, issuer_cert.pem_data,
                                                         issuer_key.private_key,