openstack
/
manila
Code Issues Proposed changes

Merge "Add temporary link to patched paramiko"

This commit is contained in:
Zuul 2022-06-21 14:01:59 +00:00 committed by Gerrit Code Review
parent 5df22b3320 72a0a1b9d8
commit ebdfb3e504
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manila/utils.py
View File

@ -38,6 +38,7 @@ from oslo_config import cfg
from oslo_log import log
from oslo_utils import importutils
from oslo_utils import netutils
from oslo_utils.secretutils import md5
from oslo_utils import strutils
from oslo_utils import timeutils
import paramiko
@ -61,6 +62,21 @@ _ISO8601_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S'
synchronized = lockutils.synchronized_with_prefix('manila-')
def get_fingerprint(self):
"""Patch paramiko
This method needs to be patched to allow paramiko to work under FIPS.
Until the patch to do this merges, patch paramiko here.
TODO(carloss) Remove this when paramiko is patched.
See https://github.com/paramiko/paramiko/pull/1928
"""
return md5(self.asbytes(), usedforsecurity=False).digest()
paramiko.pkey.PKey.get_fingerprint = get_fingerprint
def isotime(at=None, subsecond=False):
"""Stringify time in ISO 8601 format."""