Revize dd03da19

Re #8472 - Changed access modifiers of some methods and fixed verify_ca_test.py

proj/services/cryptography.py

@@ -12 +12 @@
 class CryptographyService:
 
     @staticmethod
-    def subject_to_param_format(subject):
+    def _subject_to_param_format(subject):
         subj_dict = {}
         if subject.common_name is not None:
             subj_dict["CN"] = subject.common_name
@@ -96 +96 @@
         assert key is not None
         assert subject is not None
 
-        subj = self.subject_to_param_format(subject)
+        subj = self._subject_to_param_format(subject)
 
         with TemporaryFile("openssl.conf", config) as conf_path:
             args = ["req", "-x509", "-new", "-subj", subj,
@@ -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)
 
@@ -126 +126 @@
         :return: string containing the generated certificate signing request in PEM format
         """
 
-        subj_param = self.subject_to_param_format(subject)
+        subj_param = self._subject_to_param_format(subject)
 
         args = ["req", "-new", "-subj", subj_param, "-key", "-"]
 
@@ -136 +136 @@
 
         return self._run_for_output(args, proc_input=bytes(subject_key, encoding="utf-8")).decode()
 
-    def sign_csr(self, csr, issuer_pem, issuer_key, issuer_key_pass=None, extensions="", days=30):
+    def _sign_csr(self, csr, issuer_pem, issuer_key, issuer_key_pass=None, extensions="", days=30):
         """
         Signs the given CSR by the given issuer CA
 
@@ -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)
-        return self.sign_csr(csr, issuer_pem, issuer_key, issuer_key_pass=issuer_key_pass, extensions=extensions,
-                             days=days)
+        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)
 
     @staticmethod
     def verify_cert(certificate):