Revize 87c56935

Re #8575 - Fixed an issue where serial number was not passed when creating certificates
Removed a TODO that has already been fixed

src/services/certificate_service.py

@@ -55 +55 @@
 
         # create a new self signed  certificate
         cert_pem = self.cryptography_service.create_sscrt(subject, key.private_key, key_pass=key.password,
-                                                          extensions=extensions, config=config, days=days)
+                                                          extensions=extensions, config=config, days=days, sn=cert_id)
         # specify CA usage
         usages[CA_ID] = True
 
@@ -123 +123 @@
                                                         issuer_key.private_key,
                                                         subject_key_pass=subject_key.password,
                                                         issuer_key_pass=issuer_key.password, extensions=extensions,
-                                                        days=days)
+                                                        days=days,
+                                                        sn=cert_id)
 
         # specify CA usage
         usages[CA_ID] = True
@@ -171 +172 @@
         if usages is None:
             usages = {}
 
+        # get the next certificate ID in order to be able to specify the serial number
+        cert_id = self.certificate_repository.get_next_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,
                                                         subject_key_pass=subject_key.password,
                                                         issuer_key_pass=issuer_key.password, extensions=extensions,
-                                                        days=days)
+                                                        days=days,
+                                                        sn=cert_id
+                                                        )
 
         # wrap the generated certificate using Certificate class
         certificate = self.__create_wrapper(cert_pem, subject_key.private_key_id, usages,

src/services/cryptography.py

@@ -205 +205 @@
         params = ["x509", "-req", "-in", "-", "-CA", "-", "-CAkey", "-", "-CAcreateserial", "-days", str(days),
                   "-set_serial", str(sn)]
 
-        # TODO delete created -.srl file
-
         with TemporaryFile("extensions.conf", extensions) as ext_path:
             # add the passphrase even when None is passed. Otherwise when running tests with pytest some tests freeze
             # waiting for the passphrase to be typed in