From 6fda45896496610bdf21e99b935e0c575c9cdde0 Mon Sep 17 00:00:00 2001 From: Alan Yee Date: Mon, 1 Aug 2016 11:34:51 -0700 Subject: Update demo_server.py Updating base64 code in comments --- demos/demo_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demos/demo_server.py') diff --git a/demos/demo_server.py b/demos/demo_server.py index c4af9b10..4867e9ca 100644 --- a/demos/demo_server.py +++ b/demos/demo_server.py @@ -40,7 +40,7 @@ print('Read key: ' + u(hexlify(host_key.get_fingerprint()))) class Server (paramiko.ServerInterface): - # 'data' is the output of base64.encodestring(str(key)) + # 'data' is the output of base64.b64encode(key) # (using the "user_rsa_key" files) data = (b'AAAAB3NzaC1yc2EAAAABIwAAAIEAyO4it3fHlmGZWJaGrfeHOVY7RWO3P9M7hp' b'fAu7jJ2d7eothvfeuoRFtJwhUmZDluRdFyhFY/hFAh76PJKGAusIqIQKlkJxMC' -- cgit v1.2.3 From afbcd96fcca5aa4ccb72421d9660874586cbef4f Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 1 Jun 2017 12:42:35 -0700 Subject: Remove unused value from demo/test. Honestly not sure WTF --- demos/demo_server.py | 4 +--- tests/test_ssh_gss.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'demos/demo_server.py') diff --git a/demos/demo_server.py b/demos/demo_server.py index 4867e9ca..3a7ec854 100644 --- a/demos/demo_server.py +++ b/demos/demo_server.py @@ -96,9 +96,7 @@ class Server (paramiko.ServerInterface): return paramiko.AUTH_FAILED def enable_auth_gssapi(self): - UseGSSAPI = True - GSSAPICleanupCredentials = False - return UseGSSAPI + return True def get_allowed_auths(self, username): return 'gssapi-keyex,gssapi-with-mic,password,publickey' diff --git a/tests/test_ssh_gss.py b/tests/test_ssh_gss.py index e20d348f..967b3b81 100644 --- a/tests/test_ssh_gss.py +++ b/tests/test_ssh_gss.py @@ -43,9 +43,7 @@ class NullServer (paramiko.ServerInterface): return paramiko.AUTH_FAILED def enable_auth_gssapi(self): - UseGSSAPI = True - GSSAPICleanupCredentials = True - return UseGSSAPI + return True def check_channel_request(self, kind, chanid): return paramiko.OPEN_SUCCEEDED -- cgit v1.2.3