iotests: Use aes-128-cbc
Our gnutls crypto backend (which is the default as of 8bd0931f6) supports neither twofish-128 nor the CTR mode. CBC and aes-128 are supported by all of our backends (as far as I can tell), so use aes-128-cbc in our iotests. (We could also use e.g. aes-256-cbc, but the different key sizes would lead to different key slot offsets and so change the reference output more, which is why I went with aes-128.) Signed-off-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20211117151707.52549-2-hreitz@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Tested-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
22c36b75c8
commit
cb5a24d7f6
@ -162,8 +162,8 @@ with iotests.FilePath('t.qcow2') as disk_path, \
|
||||
'encrypt': {
|
||||
'format': 'luks',
|
||||
'key-secret': 'keysec0',
|
||||
'cipher-alg': 'twofish-128',
|
||||
'cipher-mode': 'ctr',
|
||||
'cipher-alg': 'aes-128',
|
||||
'cipher-mode': 'cbc',
|
||||
'ivgen-alg': 'plain64',
|
||||
'ivgen-hash-alg': 'md5',
|
||||
'hash-alg': 'sha1',
|
||||
|
@ -97,7 +97,7 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (encrypted) ===
|
||||
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "encrypt": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}}
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "qcow2", "encrypt": {"cipher-alg": "aes-128", "cipher-mode": "cbc", "format": "luks", "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0"}, "file": {"driver": "file", "filename": "TEST_DIR/PID-t.qcow2"}, "size": 33554432}}}
|
||||
{"return": {}}
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
@ -115,10 +115,10 @@ Format specific information:
|
||||
encrypt:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
cipher alg: aes-128
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
format: luks
|
||||
cipher mode: ctr
|
||||
cipher mode: cbc
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
|
@ -83,8 +83,8 @@ with iotests.FilePath('t.luks') as disk_path, \
|
||||
},
|
||||
'size': size,
|
||||
'key-secret': 'keysec0',
|
||||
'cipher-alg': 'twofish-128',
|
||||
'cipher-mode': 'ctr',
|
||||
'cipher-alg': 'aes-128',
|
||||
'cipher-mode': 'cbc',
|
||||
'ivgen-alg': 'plain64',
|
||||
'ivgen-hash-alg': 'md5',
|
||||
'hash-alg': 'sha1',
|
||||
|
@ -59,7 +59,7 @@ Format specific information:
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"cipher-alg": "twofish-128", "cipher-mode": "ctr", "driver": "luks", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0", "size": 67108864}}}
|
||||
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"cipher-alg": "aes-128", "cipher-mode": "cbc", "driver": "luks", "file": {"driver": "file", "filename": "TEST_DIR/PID-t.luks"}, "hash-alg": "sha1", "iter-time": 10, "ivgen-alg": "plain64", "ivgen-hash-alg": "md5", "key-secret": "keysec0", "size": 67108864}}}
|
||||
{"return": {}}
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
|
||||
{"return": {}}
|
||||
@ -71,9 +71,9 @@ encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
cipher alg: aes-128
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: ctr
|
||||
cipher mode: cbc
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
|
Loading…
x
Reference in New Issue
Block a user