URL: https://github.com/freeipa/freeipa/pull/999
Author: tomaskrizek
 Title: #999: dnssec: fix localhsm.py utility script
Action: opened

PR body:
"""
See e6b2ed6b68589ff7ee39b95559836af54f39e2de for details.

Fixes https://pagure.io/freeipa/issue/7116

Signed-off-by: Tomas Krizek <tkri...@redhat.com>
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/999/head:pr999
git checkout pr999
From 87ed9d7a852917a2e487070d79245053dc60087d Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tkri...@redhat.com>
Date: Wed, 23 Aug 2017 16:53:31 +0200
Subject: [PATCH] dnssec: fix localhsm.py utility script

See e6b2ed6b68589ff7ee39b95559836af54f39e2de for details.

Fixes https://pagure.io/freeipa/issue/7116

Signed-off-by: Tomas Krizek <tkri...@redhat.com>
---
 ipaserver/dnssec/localhsm.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ipaserver/dnssec/localhsm.py b/ipaserver/dnssec/localhsm.py
index 50a11714ff..0172399da2 100755
--- a/ipaserver/dnssec/localhsm.py
+++ b/ipaserver/dnssec/localhsm.py
@@ -16,6 +16,8 @@
 from ipaserver.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
                                      keytype_id2name, keytype_name2id,
                                      ldap2p11helper_api_params)
+from ipalib.constants import SOFTHSM_DNSSEC_TOKEN_LABEL
+
 
 private_key_api_params = set(["label", "id", "data", "unwrapping_key",
     "wrapping_mech", "key_type", "cka_always_authenticate", "cka_copyable",
@@ -188,7 +190,7 @@ def import_private_key(self, source, data, unwrapping_key):
 if __name__ == '__main__':
     if 'SOFTHSM2_CONF' not in os.environ:
         os.environ['SOFTHSM2_CONF'] = paths.DNSSEC_SOFTHSM2_CONF
-    localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, 0,
+    localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, SOFTHSM_DNSSEC_TOKEN_LABEL,
             open(paths.DNSSEC_SOFTHSM_PIN).read())
 
     print('replica public keys: CKA_WRAP = TRUE')
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org

Reply via email to