Revize 2e99bad0

Re #8472 - Changed access modifier of create_csr method to private (was protected previously)

proj/services/cryptography.py

@@ -116 +116 @@
 
             return self._run_for_output(args, proc_input=bytes(key, encoding="utf-8")).decode()
 
-    def _create_csr(self, subject, subject_key, subject_key_pass=""):
+    def __create_csr(self, subject, subject_key, subject_key_pass=""):
         """
         Creates a CSR (Certificate Signing Request)
 
@@ -188 +188 @@
         :param days: number of days for which the certificate will be valid
         :return: string containing the generated certificate in PEM format
         """
-        csr = self._create_csr(subject, subject_key, subject_key_pass=subject_key_pass)
+        csr = self.__create_csr(subject, subject_key, subject_key_pass=subject_key_pass)
         return self._sign_csr(csr, issuer_pem, issuer_key, issuer_key_pass=issuer_key_pass, extensions=extensions,
                               days=days)
 

proj/tests/services/cryptography/make_csr_test.py

@@ -12 +12 @@
     private_key = service.create_private_key()
 
     subject = Subject(common_name="foo", country="CZ")
-    csr = service._create_csr(subject, private_key)
+    csr = service._CryptographyService__create_csr(subject, private_key)
 
     assert "Subject: CN = foo, C = CZ" in get_csr_pem(csr)
 
@@ -21 +21 @@
     private_key = service.create_private_key(passphrase="foobar")
 
     subject = Subject(common_name="foo", country="CZ", organization_unit="Mysterious Unit")
-    csr = service._create_csr(subject, private_key, subject_key_pass="foobar")
+    csr = service._CryptographyService__create_csr(subject, private_key, subject_key_pass="foobar")
 
     assert "Subject: CN = foo, C = CZ, OU = Mysterious Unit" in get_csr_pem(csr)

proj/tests/services/cryptography/sign_csr_test.py

@@ -18 +18 @@
 
     # create a private key to be used to make a CSR for the intermediate CA
     inter_key = service.create_private_key()
-    csr = service._create_csr(Subject(common_name="bar", country="CZ"), inter_key)
+    csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA
     inter_ca = service._sign_csr(csr, root_ca, root_key)
@@ -38 +38 @@
 
     # create a private key to be used to make a CSR for the intermediate CA
     inter_key = service.create_private_key()
-    csr = service._create_csr(Subject(common_name="bar", country="CZ"), inter_key)
+    csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA and specify root key passphrase
     inter_ca = service._sign_csr(csr, root_ca, root_key, issuer_key_pass=root_key_passphrase)
@@ -70 +70 @@
 
     # create a private key to be used to make a CSR for the intermediate CA
     inter_key = service.create_private_key()
-    csr = service._create_csr(Subject(common_name="bar", country="CZ"), inter_key)
+    csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA and specify root key passphrase and specify extensions (AIA and CA)
     inter_ca = service._sign_csr(csr, root_ca, root_key,