dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More formatting + link fixes

This commit is contained in:
Jeff Forcier 2014-02-24 17:43:22 -08:00
parent 0bf0f08ee4
commit 6d71fbd9ef
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
paramiko/transport.py
View File

@ -420,9 +420,8 @@ class Transport (threading.Thread):
key info, not just the public half. Only one key of each type (RSA or key info, not just the public half. Only one key of each type (RSA or
DSS) is kept. DSS) is kept.
:param key: the host key to add, usually an `RSAKey <rsakey.RSAKey>` or :param key: the host key to add, usually an `.RSAKey` or `.DSSKey`.
`DSSKey <dsskey.DSSKey>`. :type key: `.PKey`
:type key: `PKey <pkey.PKey>`
""" """
self.server_key_dict[key.get_name()] = key self.server_key_dict[key.get_name()] = key
@ -438,7 +437,7 @@ class Transport (threading.Thread):
yet, ``None`` is returned. In client mode, the behavior is undefined. yet, ``None`` is returned. In client mode, the behavior is undefined.
:return: host key of the type negotiated by the client, or ``None``. :return: host key of the type negotiated by the client, or ``None``.
:rtype: `PKey <pkey.PKey>` :rtype: `.PKey`
""" """
try: try:
return self.server_key_dict[self.host_key_type] return self.server_key_dict[self.host_key_type]
@ -458,16 +457,16 @@ class Transport (threading.Thread):
fits certain criteria. These primes are pretty difficult to compute, fits certain criteria. These primes are pretty difficult to compute,
so they can't be generated on demand. But many systems contain a file so they can't be generated on demand. But many systems contain a file
of suitable primes (usually named something like ``/etc/ssh/moduli``). of suitable primes (usually named something like ``/etc/ssh/moduli``).
If you call ``load_server_moduli`` and it returns ``True``, then this If you call `load_server_moduli` and it returns ``True``, then this
file of primes has been loaded and we will support "group-exchange" in file of primes has been loaded and we will support "group-exchange" in
server mode. Otherwise server mode will just claim that it doesn't server mode. Otherwise server mode will just claim that it doesn't
support that method of key negotiation. support that method of key negotiation.
:param filename: optional path to the moduli file, if you happen to :param str filename:
know that it's not in a standard location. optional path to the moduli file, if you happen to know that it's
:type filename: str not in a standard location.
:return: True if a moduli file was successfully loaded; False :return:
otherwise. True if a moduli file was successfully loaded; False otherwise.
:rtype: bool :rtype: bool
.. note:: This has no effect when used in client mode. .. note:: This has no effect when used in client mode.