Merge "Drop pycrypto from utility genpwd.py"
This commit is contained in:
commit
772038e7c5
|
@ -19,7 +19,12 @@ import random
|
|||
import string
|
||||
import sys
|
||||
|
||||
from Crypto.PublicKey import RSA
|
||||
from cryptography.hazmat.backends import default_backend
|
||||
from cryptography.hazmat.primitives.asymmetric import rsa
|
||||
from cryptography.hazmat.primitives.serialization import Encoding
|
||||
from cryptography.hazmat.primitives.serialization import NoEncryption
|
||||
from cryptography.hazmat.primitives.serialization import PrivateFormat
|
||||
from cryptography.hazmat.primitives.serialization import PublicFormat
|
||||
from hashlib import md5
|
||||
from hashlib import sha256
|
||||
from oslo_utils import uuidutils
|
||||
|
@ -35,9 +40,17 @@ if PROJECT_ROOT not in sys.path:
|
|||
|
||||
|
||||
def generate_RSA(bits=4096):
|
||||
new_key = RSA.generate(bits, os.urandom)
|
||||
private_key = new_key.exportKey("PEM")
|
||||
public_key = new_key.publickey().exportKey("OpenSSH")
|
||||
# public_exponent set to 655537 is what pyCA recommends
|
||||
new_key = rsa.generate_private_key(public_exponent=65537,
|
||||
key_size=bits,
|
||||
backend=default_backend())
|
||||
# we strip trailing space for 1:1 compat with previous implementation
|
||||
private_key = new_key.private_bytes(
|
||||
encoding=Encoding.PEM,
|
||||
format=PrivateFormat.PKCS8,
|
||||
encryption_algorithm=NoEncryption())
|
||||
public_key = new_key.public_key().public_bytes(encoding=Encoding.OpenSSH,
|
||||
format=PublicFormat.OpenSSH)
|
||||
return private_key, public_key
|
||||
|
||||
|
||||
|
|
|
@ -13,11 +13,7 @@ repo_gpgcheck=1
|
|||
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
|
||||
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
||||
EOEF
|
||||
#
|
||||
# NOTE(sbezverk) docker-1.12.6-28.git1398f24.el7.centos.x86_64 breaks several gate jobs.
|
||||
# Version pinning needs to be removed after docker fixes it.
|
||||
#
|
||||
yum install -y docker-1.12.6-16.el7.centos kubeadm kubelet kubectl kubernetes-cni ebtables
|
||||
yum install -y docker kubeadm kubelet kubectl kubernetes-cni ebtables
|
||||
sed -i 's/10.96.0.10/172.16.128.10/g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
|
||||
EOF
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue