Skip to content

Commit fdd2957

Browse files
committed
correctly handle openssl output
Signed-off-by: Zen <[email protected]>
1 parent dd3c20b commit fdd2957

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/ugrd/crypto/cryptsetup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'desultory'
2-
__version__ = '2.7.0'
2+
__version__ = '2.7.1'
33

44
from zenlib.util import contains
55

@@ -193,8 +193,10 @@ def _validate_cryptsetup_device(self, mapped_name) -> None:
193193
for dep in self['dependencies']:
194194
if dep.name.startswith('libcrypto.so'):
195195
openssl_kdfs = self._run(['openssl', 'list', '-kdf-algorithms']).stdout.decode().lower().split('\n')
196-
if 'argon2id' in openssl_kdfs:
197-
break
196+
self.logger.debug("OpenSSL KDFs: %s" % openssl_kdfs)
197+
for kdf in openssl_kdfs:
198+
if kdf.lstrip().startswith('argon2id') and 'default' in kdf:
199+
break
198200
else: # If argon support cannot be validated, raise an error if argon2id is used
199201
if cryptsetup_info.get('header_file'):
200202
self.logger.error("[%s] Unable to check: libargon2.so" % mapped_name)

0 commit comments

Comments
 (0)