summaryrefslogtreecommitdiff
path: root/paramiko/__init__.py
diff options
context:
space:
mode:
authorPaul Kapp <paullkapp+radssh@gmail.com>2017-08-22 06:31:47 -0400
committerPaul Kapp <paullkapp+radssh@gmail.com>2017-08-22 06:31:47 -0400
commit7229597ce0925ee8dafe97544f42dcc193fbad8f (patch)
treed0578884ddc4d79aad3699298600dd5fd8d0fd83 /paramiko/__init__.py
parent08f503740182608570ac87661225fe2e11914d8f (diff)
downloadparamiko-7229597ce0925ee8dafe97544f42dcc193fbad8f.tar.gz
Generic certificate support
Roll agnostic certificate support into PKey, and tweak publickey authentication to use it only if set. Requires explicit call to PKey.load_certificate() in order to alter the authentication behavior.
Diffstat (limited to 'paramiko/__init__.py')
-rw-r--r--paramiko/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index d67ad62f..5d3a10fc 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -30,7 +30,7 @@ __license__ = "GNU Lesser General Public License (LGPL)"
from paramiko.transport import SecurityOptions, Transport
from paramiko.client import (
- SSHClient, MissingHostKeyPolicy, AutoAddPolicy, RejectPolicy,
+ SSHClient, MissingHostKeyPolicy, AutoAddPolicy, RejectPolicy,
WarningPolicy,
)
from paramiko.auth_handler import AuthHandler
@@ -57,7 +57,7 @@ from paramiko.message import Message
from paramiko.packet import Packetizer
from paramiko.file import BufferedFile
from paramiko.agent import Agent, AgentKey
-from paramiko.pkey import PKey
+from paramiko.pkey import PKey, PublicBlob
from paramiko.hostkeys import HostKeys
from paramiko.config import SSHConfig
from paramiko.proxy import ProxyCommand