Merge "tests/__init__.py: ssh-keygen -m PEM for bouncycastle"

fkalinski · Dec 10, 2018 · d416d10 · d416d10
2 parents e9fede8 + d41f5d7
commit d416d10
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/git_review/tests/__init__.py b/git_review/tests/__init__.py
@@ -153,7 +153,7 @@ def init_gerrit(self):
         os.makedirs(self._dir('gsite', 'etc'))
         # create SSH host key
         host_key_file = self._dir('gsite', 'etc', 'ssh_host_rsa_key')
-        utils.run_cmd('ssh-keygen', '-t', 'rsa', '-b', '4096',
+        utils.run_cmd('ssh-keygen', '-t', 'rsa', '-b', '4096', '-m', 'PEM',
                                     '-f', host_key_file, '-N', '')
 
         print("Creating a new golden site of version " + GOLDEN_SITE_VER)
@@ -171,7 +171,7 @@ def init_gerrit(self):
 
         # create SSH public key
         key_file = self._dir('gsite', 'test_ssh_key')
-        utils.run_cmd('ssh-keygen', '-t', 'rsa', '-b', '4096',
+        utils.run_cmd('ssh-keygen', '-t', 'rsa', '-b', '4096', '-m', 'PEM',
                                     '-f', key_file, '-N', '')
         with open(key_file + '.pub', 'rb') as pub_key_file:
             pub_key = pub_key_file.read()