From 40680fd2a95ba0b00c81f5e22241b3a16d6eee54 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Mon, 8 Jun 2015 16:14:24 +0200 Subject: Update PKCS#11 mechanism constants for AES key wrapping to PKCS#11 v2.40. SoftHSM 2.0.0rc1 was updates to these new constants to avoid collision with Blowfish mechanisms. Reviewed-By: Martin Basti --- freeipa.spec.in | 2 +- ipapython/ipap11helper/p11helper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 64b24c808..9ea055723 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -89,7 +89,7 @@ BuildRequires: libunistring-devel BuildRequires: python-lesscpy BuildRequires: python-yubico >= 1.2.3 BuildRequires: python-backports-ssl_match_hostname -BuildRequires: softhsm-devel >= 2.0.0b1-3 +BuildRequires: softhsm-devel >= 2.0.0rc1-1 BuildRequires: openssl-devel BuildRequires: p11-kit-devel BuildRequires: pki-base >= 10.2.4-1 diff --git a/ipapython/ipap11helper/p11helper.c b/ipapython/ipap11helper/p11helper.c index b05e17da2..4a5ae8a6b 100644 --- a/ipapython/ipap11helper/p11helper.c +++ b/ipapython/ipap11helper/p11helper.c @@ -50,8 +50,8 @@ #include "library.h" // compat TODO -#define CKM_AES_KEY_WRAP (0x1090) -#define CKM_AES_KEY_WRAP_PAD (0x1091) +#define CKM_AES_KEY_WRAP (0x2109) +#define CKM_AES_KEY_WRAP_PAD (0x210a) // TODO #define CKA_COPYABLE (0x0017) -- cgit