summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2015-03-09 13:15:01 +0100
committerTomas Babej <tbabej@redhat.com>2015-03-11 14:32:20 +0100
commit6af49259c2be8da66fe4f46b1eb6c25a69185a6b (patch)
tree597fedbcc7a42d6c736f60f204a77f2fba70a6d0 /ipapython
parent8dac096ae3a294dc55b32b69b873013fd687e945 (diff)
downloadfreeipa-6af49259c2be8da66fe4f46b1eb6c25a69185a6b.tar.gz
freeipa-6af49259c2be8da66fe4f46b1eb6c25a69185a6b.tar.xz
freeipa-6af49259c2be8da66fe4f46b1eb6c25a69185a6b.zip
Fix dead code in ipap11helper module
https://fedorahosted.org/freeipa/ticket/4657 Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipap11helper/p11helper.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/ipapython/ipap11helper/p11helper.c b/ipapython/ipap11helper/p11helper.c
index eff49f590..b05e17da2 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);