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

Use configurable hash_type for general Key fingerprinting

Browse Source
This commit is contained in:
Bo Maryniuk 2016-02-12 16:34:26 +01:00
parent f0d931f4d0
commit 785717703b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/key.py
View File

@ -21,10 +21,8 @@ def finger():
salt '*' key.finger salt '*' key.finger
''' '''
return salt.utils.pem_finger( return salt.utils.pem_finger(os.path.join(__opts__['pki_dir'], 'minion.pub'),
os.path.join(__opts__['pki_dir'], 'minion.pub'), sum_type=__opts__.get('hash_type', 'md5'))
sum_type=__opts__['hash_type']
)
def finger_master(): def finger_master():
@ -37,7 +35,5 @@ def finger_master():
salt '*' key.finger_master salt '*' key.finger_master
''' '''
return salt.utils.pem_finger( return salt.utils.pem_finger(os.path.join(__opts__['pki_dir'], 'minion_master.pub'),
os.path.join(__opts__['pki_dir'], 'minion_master.pub'), sum_type=__opts__.get('hash_type', 'md5'))
sum_type=__opts__['hash_type']
)