From fc0d9818c04ddb99d340781004f63b46d19fdef7 Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Sun, 3 Sep 2017 22:58:27 -0400 Subject: ensure ed25519 password is bytes fixes #1039 --- paramiko/ed25519key.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paramiko/ed25519key.py b/paramiko/ed25519key.py index a50d68bc..1557c5b2 100644 --- a/paramiko/ed25519key.py +++ b/paramiko/ed25519key.py @@ -25,6 +25,7 @@ import six from paramiko.message import Message from paramiko.pkey import PKey +from paramiko.py3compat import b from paramiko.ssh_exception import SSHException, PasswordRequiredException @@ -113,7 +114,7 @@ class Ed25519Key(PKey): else: cipher = Transport._cipher_info[ciphername] key = bcrypt.kdf( - password=password, + password=b(password), salt=bcrypt_salt, desired_key_bytes=cipher["key-size"] + cipher["block-size"], rounds=bcrypt_rounds, -- cgit v1.2.3