Patch attached. -- Martin Basti
From e7412b19bc1e6098181c71d18eba1cb261f3a128 Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Mon, 9 Mar 2015 13:15:01 +0100 Subject: [PATCH] Fix dead code in ipap11helper module https://fedorahosted.org/freeipa/ticket/4657 --- ipapython/ipap11helper/p11helper.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ipapython/ipap11helper/p11helper.c b/ipapython/ipap11helper/p11helper.c index eff49f5908412eb7b6e4c163710843e64e3bb69b..b05e17da24b94ea16f15f1663dc1dc4c1d683ea4 100644 --- a/ipapython/ipap11helper/p11helper.c +++ b/ipapython/ipap11helper/p11helper.c @@ -1320,7 +1320,7 @@ static PyObject *P11_Helper_import_RSA_public_key(P11_Helper *self, GOTO_FAIL; } modulus_len = BN_bn2bin(rsa->n, (unsigned char *) modulus); - if (modulus == NULL) { + if (modulus_len == 0) { PyErr_SetString(ipap11helperError, "import_RSA_public_key: BN_bn2bin modulus error"); GOTO_FAIL; @@ -1332,7 +1332,7 @@ static PyObject *P11_Helper_import_RSA_public_key(P11_Helper *self, GOTO_FAIL; } exponent_len = BN_bn2bin(rsa->e, (unsigned char *) exponent); - if (exponent == NULL) { + if (exponent_len == 0) { PyErr_SetString(ipap11helperError, "import_RSA_public_key: BN_bn2bin exponent error"); GOTO_FAIL; @@ -1531,11 +1531,7 @@ static PyObject *P11_Helper_export_wrapped_key(P11_Helper *self, PyErr_NoMemory(); GOTO_FAIL; } - if (wrapped_key == NULL) { - rv = CKR_HOST_MEMORY; - if (!check_return_value(rv, "key wrapping: buffer allocation")) - GOTO_FAIL; - } + rv = self->p11->C_WrapKey(self->session, &wrapping_mech, object_wrapping_key, object_key, wrapped_key, &wrapped_key_len); -- 2.1.0
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
