openstack
/
keystone
Code Issues Proposed changes

Merge "Make hash_algorithms order deterministic"

This commit is contained in:
Jenkins 2016-08-05 20:12:21 +00:00 committed by Gerrit Code Review
parent 910e6e0a12 3de3d71044
commit 3f04fc368f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/conf/token.py
View File

@ -125,11 +125,12 @@ request for a scoped token to avoid re-scoping altogether.
"""))
# This attribute only exists in Python 2.7.8+ or 3.2+
hash_algorithm_choices = getattr(hashlib, 'algorithms_guaranteed', None)
hash_choices = getattr(hashlib, 'algorithms_guaranteed', None)
hash_choices = sorted(hash_choices) if hash_choices else None
hash_algorithm = cfg.StrOpt(
'hash_algorithm',
default='md5',
choices=hash_algorithm_choices,
choices=hash_choices,
deprecated_for_removal=True,
deprecated_reason=constants._DEPRECATE_PKI_MSG,
help=utils.fmt("""