From c6b9b76307faa001670bc990fbe88aeb23bad403 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 26 Apr 2017 18:15:40 +0200 Subject: [PATCH] Vault: Explicitly default to 3DES CBC The server-side plugin for IPA Vault relied on the fact that the default oid for encryption algorithm is 3DES in CBC mode (DES-EDE3-CBC). Dogtag 10.4 has changed the default from 3DES to AES. Pass the correct algorithm OID to KeyClient.archive_encrypted_data(). Closes: https://pagure.io/freeipa/issue/6899 Signed-off-by: Christian Heimes Reviewed-By: Fraser Tweedale --- ipaserver/plugins/vault.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ipaserver/plugins/vault.py b/ipaserver/plugins/vault.py index 57e1ed7800063822f87da5a71f0f3a0df4d8dd33..d46aca821d2ec94a38dd7cc930f26038d5d80a90 100644 --- a/ipaserver/plugins/vault.py +++ b/ipaserver/plugins/vault.py @@ -38,6 +38,14 @@ from ipapython.dn import DN if api.env.in_server: import pki.account import pki.key + # pylint: disable=no-member + try: + # pki >= 10.4.0 + from pki.crypto import DES_EDE3_CBC_OID + except ImportError: + DES_EDE3_CBC_OID = pki.key.KeyClient.DES_EDE3_CBC_OID + # pylint: enable=no-member + if six.PY3: unicode = str @@ -1059,8 +1067,8 @@ class vault_archive_internal(PKQuery): pki.key.KeyClient.PASS_PHRASE_TYPE, wrapped_vault_data, wrapped_session_key, - None, - nonce, + algorithm_oid=DES_EDE3_CBC_OID, + nonce_iv=nonce, ) kra_account.logout() -- 2.12.2