Change cache uniqifier from using md5 to sha-1
FIPS 140-2 does not allow MD5 use for most purposes and systems in "FIPS mode" (fips=1 kernel flag) will cause software using MD5 from popular libraries to fail. Also change the default cache dir to use ~/.cache/ Change-Id: I6f653f10249992196abb04e05c54df5fb244b182
This commit is contained in:

committed by
Eric Harney

parent
7cb50b4c4a
commit
4cf62cf31f
@@ -261,14 +261,14 @@ class Manager(common_base.HookableMixin):
|
||||
often enough to keep the cache reasonably up-to-date.
|
||||
"""
|
||||
base_dir = utils.env('CINDERCLIENT_UUID_CACHE_DIR',
|
||||
default="~/.cinderclient")
|
||||
default="~/.cache/cinderclient")
|
||||
|
||||
# NOTE(sirp): Keep separate UUID caches for each username + endpoint
|
||||
# pair
|
||||
username = utils.env('OS_USERNAME', 'CINDER_USERNAME')
|
||||
url = utils.env('OS_URL', 'CINDER_URL')
|
||||
uniqifier = hashlib.md5(username.encode('utf-8') +
|
||||
url.encode('utf-8')).hexdigest()
|
||||
uniqifier = hashlib.sha1(username.encode('utf-8') +
|
||||
url.encode('utf-8')).hexdigest()
|
||||
|
||||
cache_dir = os.path.expanduser(os.path.join(base_dir, uniqifier))
|
||||
|
||||
|
Reference in New Issue
Block a user