← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat/common/crypt.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2015-09-08 15:52:07 UTC
  • mfrom: (1.1.28)
  • Revision ID: package-import@ubuntu.com-20150908155207-zi2r1rckyrevr5u7
Tags: 1:5.0.0~b3-0ubuntu1
* New upstream milestone for OpenStack Liberty.
* d/control: Align (build-)depends with upstream.
* d/p/fix-dummy-resource-missing.patch: Dropped. Fixed in milestone.
* d/p/move-extensions.patch: Dropped. Fixed in milestone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/common/crypt.py
40
40
    encoded_key = base64.b64encode(encryption_key.encode('utf-8'))
41
41
    sym = fernet.Fernet(encoded_key)
42
42
    res = sym.encrypt(encodeutils.safe_encode(value))
43
 
    return 'cryptography_decrypt_v1', res
 
43
    return 'cryptography_decrypt_v1', encodeutils.safe_decode(res)
44
44
 
45
45
 
46
46
def decrypt(method, data, encryption_key=None):