valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove SHA1 to SHA265 by default

Browse Source
This commit is contained in:
Bo Maryniuk 2016-02-12 16:52:36 +01:00
parent 6198976edb
commit efb78f1055
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config.py
View File

@ -864,7 +864,7 @@ DEFAULT_MINION_OPTS = {
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_ssl_verify': False,
'hash_type': 'sha1',
'hash_type': 'sha256',
'disable_modules': [],
'disable_returners': [],
'whitelist_modules': [],

6
salt/utils/__init__.py
View File

@ -858,10 +858,10 @@ def path_join(*parts):
))
def pem_finger(path=None, key=None, sum_type='sha1'):
def pem_finger(path=None, key=None, sum_type='sha256'):
'''
Pass in either a raw pem string, or the path on disk to the location of a
pem file, and the type of cryptographic hash to use. The default is SHA1.
pem file, and the type of cryptographic hash to use. The default is SHA256.
The fingerprint of the pem will be returned.
If neither a key nor a path are passed in, a blank string will be returned.
@ -1979,7 +1979,7 @@ def safe_walk(top, topdown=True, onerror=None, followlinks=True, _seen=None):
yield top, dirs, nondirs
def get_hash(path, form='sha1', chunk_size=65536):
def get_hash(path, form='sha256', chunk_size=65536):
'''
Get the hash sum of a file