Skip to content

Commit

Permalink
Merge pull request #16 from oofnikj/load_openssh
Browse files Browse the repository at this point in the history
use load_ssh_private_key for existing keys
  • Loading branch information
mpieters3 authored Aug 20, 2021
2 parents a6fa0fe + 3282131 commit 5753363
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugins/connection/eci.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
try:
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
from cryptography.hazmat.primitives.serialization import load_pem_private_key
from cryptography.hazmat.primitives.serialization.ssh import load_ssh_private_key
from cryptography.hazmat.primitives.asymmetric import rsa
from cryptography.hazmat.primitives import serialization
HAS_CRYPTOGRAPHY = True
Expand Down Expand Up @@ -371,7 +371,7 @@ def __init__(self, *args, **kwargs):

if self._play_context.private_key_file:
display.vvv("EXISTING PRIVATE KEY FILE AVAILABLE, USING IT")
self._private_key = load_pem_private_key(self._play_context.private_key_file, None, default_backend())
self._private_key = load_ssh_private_key(open(self._play_context.private_key_file, 'rb').read(), None, default_backend())
else:
display.vvv("NO PRIVATE KEY FILE, GENERATING ON DEMAND")
(self._play_context.private_key_file, self._private_key) = self._create_temporary_key()
Expand Down

0 comments on commit 5753363

Please sign in to comment.