common: update base64 encoding of bytes

This commit is contained in:
Daniel Martí 2016-01-04 17:32:58 +01:00
parent 920ae4692f
commit ec301b8566

View file

@ -33,6 +33,7 @@ import operator
import logging import logging
import hashlib import hashlib
import socket import socket
import base64
import xml.etree.ElementTree as XMLElementTree import xml.etree.ElementTree as XMLElementTree
from queue import Queue from queue import Queue
@ -1923,8 +1924,9 @@ def genpassword():
'''generate a random password for when generating keys''' '''generate a random password for when generating keys'''
h = hashlib.sha256() h = hashlib.sha256()
h.update(os.urandom(16)) # salt h.update(os.urandom(16)) # salt
h.update(bytes(socket.getfqdn())) h.update(socket.getfqdn().encode('utf-8'))
return h.digest().encode('base64').strip() passwd = base64.b64encode(h.digest()).strip()
return passwd.decode('utf-8')
def genkeystore(localconfig): def genkeystore(localconfig):