This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 2aa779e use x2gostartagent / x2goresume-session to pass-through the clipboard parameter (requires X2Go Server 4.0.1.16 or higher) new 2f57967 start becoming aware of ECDSA keys The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2go/_paramiko.py | 3 ++- x2go/checkhosts.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 2f57967afb301017cbe9f0325eb28c7d9ba95be9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jun 29 00:20:36 2014 +0200 start becoming aware of ECDSA keys --- x2go/_paramiko.py | 3 ++- x2go/checkhosts.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index ddad131..4f5d8ae 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -38,6 +38,7 @@ PARAMIKO_FEATURE = { 'hash-host-entries': compare_versions(PARAMIKO_VERSION, ">=", '99'), 'host-entries-reloadable': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'), 'preserve-known-hosts': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'), + 'ecdsa-hostkeys': compare_versions(PARAMIKO_VERSION, ">=", '1.11.6'), } def _SSHClient_save_host_keys(self, filename): @@ -116,7 +117,7 @@ def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True): @param hostname: the hostname (or IP) to add @type hostname: str - @param keytype: key type (C{"ssh-rsa"} or C{"ssh-dss"}) + @param keytype: key type (C{"ssh-rsa"}, C{"ssh-dss"} or C{"ecdsa-sha2-nistp256"}) @type keytype: str @param key: the key to add @type key: L{PKey} diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index ead3d91..eab4194 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -111,7 +111,7 @@ class X2GoMissingHostKeyPolicy(paramiko.MissingHostKeyPolicy): """\ Retrieve the host key name of the server to be validated. - @return: host key name (RSA, DSA, ...) + @return: host key name (RSA, DSA, ECDSA...) @rtype: C{str} """ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git