summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-05-27 10:40:50 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-05-27 10:40:50 -0400
commitf6d847cd867c09319f9fc451c09dc7322542e26b (patch)
tree443491286f802bdb29566e90e619a30147fba384 /nova/virt
parent107b15d2dd7d554d9cca177343ab45c51029d484 (diff)
prevent encryption from adding newlines on long messages
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/vmops.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ce84c8652..1fcaaeede 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1201,7 +1201,7 @@ class SimpleDH(object):
return proc.stdout.read()
def encrypt(self, text):
- cmd = 'enc -aes-128-cbc -a -pass pass:%s -nosalt' % self._shared
+ cmd = 'enc -aes-128-cbc -a -A -pass pass:%s -nosalt' % self._shared
return self._run_ssl(cmd, text).strip('\n')
def decrypt(self, text):