diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:42 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 08:15:42 -0400 |
| commit | d9eb35c69ab29a1ad7a9e3dd5325d4cab9dd2bc0 (patch) | |
| tree | bfa73aede87b442db84627cbe9075d3082a1601f /paramiko/transport.py | |
| parent | 9151b5a5ef6634142cc810193a59630c863549c3 (diff) | |
| parent | 47529be4385cffba6851f10e505f5683290d116e (diff) | |
| download | paramiko-d9eb35c69ab29a1ad7a9e3dd5325d4cab9dd2bc0.tar.gz | |
Merge branch '2.10'
Diffstat (limited to 'paramiko/transport.py')
| -rw-r--r-- | paramiko/transport.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 36ff237d..2168032f 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -549,7 +549,15 @@ class Transport(threading.Thread, ClosingContextManager): @property def preferred_keys(self): - return self._filter_algorithm("keys") + # Interleave cert variants here; resistant to various background + # overwriting of _preferred_keys, and necessary as hostkeys can't use + # the logic pubkey auth does re: injecting/checking for certs at + # runtime + filtered = self._filter_algorithm("keys") + return tuple( + filtered + + tuple("{}-cert-v01@openssh.com".format(x) for x in filtered) + ) @property def preferred_pubkeys(self): |