diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-02-08 16:33:07 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-02-09 00:59:05 +0000 |
| commit | a00729ff7421b3661e8b1a1e0fa46393379f2e96 (patch) | |
| tree | 4563b927e3a57446a4a928a72a92d72c9ad4f6e6 /azurelinuxagent/utils/textutil.py | |
| parent | 53f54030cae2de3d5fa474a61fe51f16c7a07c79 (diff) | |
| download | vyos-walinuxagent-a00729ff7421b3661e8b1a1e0fa46393379f2e96.tar.gz vyos-walinuxagent-a00729ff7421b3661e8b1a1e0fa46393379f2e96.zip | |
Import patches-unapplied version 2.1.3-0ubuntu1 to ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 53f54030cae2de3d5fa474a61fe51f16c7a07c79
New changelog entries:
* New upstream release (LP: #1543359):
- Bug fixes for extension handling
- Feature enablement for AzureStack.
Diffstat (limited to 'azurelinuxagent/utils/textutil.py')
| -rw-r--r-- | azurelinuxagent/utils/textutil.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/azurelinuxagent/utils/textutil.py b/azurelinuxagent/utils/textutil.py index e0f1395..851f98a 100644 --- a/azurelinuxagent/utils/textutil.py +++ b/azurelinuxagent/utils/textutil.py @@ -224,5 +224,13 @@ def gen_password_hash(password, crypt_id, salt_len): salt = "${0}${1}".format(crypt_id, salt) return crypt.crypt(password, salt) +def get_bytes_from_pem(pem_str): + base64_bytes = "" + for line in pem_str.split('\n'): + if "----" not in line: + base64_bytes += line + return base64_bytes + + Version = LooseVersion |