summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/client.py16
-rw-r--r--paramiko/kex_gss.py10
2 files changed, 8 insertions, 18 deletions
diff --git a/paramiko/client.py b/paramiko/client.py
index 481cbafc..265389de 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -404,10 +404,8 @@ class SSHClient (object):
two_factor = False
allowed_types = []
- """
- If GSS-API support and GSS-PI Key Exchange was performed, we attempt
- authentication with gssapi-keyex.
- """
+ # If GSS-API support and GSS-PI Key Exchange was performed, we attempt
+ # authentication with gssapi-keyex.
if gss_kex and self._transport.gss_kex_used:
try:
self._transport.auth_gssapi_keyex(username)
@@ -415,12 +413,10 @@ class SSHClient (object):
except Exception as e:
saved_exception = e
- """
- Try GSS-API authentication (gssapi-with-mic) only if GSS-API Key
- Exchange is not performed, because if we use GSS-API for the key
- exchange, there is already a fully established GSS-API context, so
- why should we do that again?
- """
+ # Try GSS-API authentication (gssapi-with-mic) only if GSS-API Key
+ # Exchange is not performed, because if we use GSS-API for the key
+ # exchange, there is already a fully established GSS-API context, so
+ # why should we do that again?
if gss_auth:
try:
self._transport.auth_gssapi_with_mic(username, gss_host,
diff --git a/paramiko/kex_gss.py b/paramiko/kex_gss.py
index cdb18496..a4e60909 100644
--- a/paramiko/kex_gss.py
+++ b/paramiko/kex_gss.py
@@ -180,10 +180,7 @@ class KexGSSGroup1(object):
if (self.f < 1) or (self.f > self.P - 1):
raise SSHException('Server kex "f" is out of range')
mic_token = m.get_string()
- """
- This must be TRUE, if there is a GSS-API token in this
- message.
- """
+ # This must be TRUE, if there is a GSS-API token in this message.
bool = m.get_boolean()
srv_token = None
if bool:
@@ -545,10 +542,7 @@ class KexGSSGex(object):
self.transport.host_key = NullHostKey()
self.f = m.get_mpint()
mic_token = m.get_string()
- """
- This must be TRUE, if there is a GSS-API token in this
- message.
- """
+ # This must be TRUE, if there is a GSS-API token in this message.
bool = m.get_boolean()
srv_token = None
if bool: