diff options
| author | Petr Spacek <pspacek@redhat.com> | 2015-03-04 15:40:33 +0100 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-03-06 10:58:10 +0100 |
| commit | 5635d1bf439b636349ea4f02a2afc2bb97b11e99 (patch) | |
| tree | 2a593c0d3bb157aa684a42dd13d0f7d2009e3675 /ipapython | |
| parent | 4b33f2b51586384fdb1f0c77ff8d22a91fce8696 (diff) | |
| download | freeipa-5635d1bf439b636349ea4f02a2afc2bb97b11e99.tar.gz freeipa-5635d1bf439b636349ea4f02a2afc2bb97b11e99.tar.xz freeipa-5635d1bf439b636349ea4f02a2afc2bb97b11e99.zip | |
p11helper: use sizeof() instead of magic constants
https://fedorahosted.org/freeipa/ticket/4657
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/ipap11helper/p11helper.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ipapython/ipap11helper/p11helper.c b/ipapython/ipap11helper/p11helper.c index b3cf6cd78..3874c4dc1 100644 --- a/ipapython/ipap11helper/p11helper.c +++ b/ipapython/ipap11helper/p11helper.c @@ -1127,7 +1127,7 @@ static PyObject *P11_Helper_export_RSA_public_key(P11_Helper *self, }; rv = self->p11->C_GetAttributeValue(self->session, object, obj_template, - 4); // FIXME: sizeof + sizeof(obj_template) / sizeof(CK_ATTRIBUTE)); if (!check_return_value(rv, "get RSA public key values - prepare")) GOTO_FAIL; @@ -1150,7 +1150,7 @@ static PyObject *P11_Helper_export_RSA_public_key(P11_Helper *self, obj_template[1].pValue = exponent; rv = self->p11->C_GetAttributeValue(self->session, object, obj_template, - 4); // FIXME: fixeof + sizeof(obj_template) / sizeof(CK_ATTRIBUTE)); if (!check_return_value(rv, "get RSA public key values")) { GOTO_FAIL; } @@ -1246,7 +1246,7 @@ static PyObject *P11_Helper_export_public_key(P11_Helper *self, }; rv = self->p11->C_GetAttributeValue(self->session, object, obj_template, - 2); + sizeof(obj_template) / sizeof(CK_ATTRIBUTE)); if (!check_return_value (rv, "export_public_key: get RSA public key values")) return NULL; @@ -1890,9 +1890,11 @@ static PyObject *P11_Helper_set_attribute(P11_Helper *self, PyObject *args, CK_ATTRIBUTE template[] = { attribute }; - rv = self->p11->C_SetAttributeValue(self->session, object, template, 1); + rv = self->p11->C_SetAttributeValue(self->session, object, template, + sizeof(template) / sizeof(CK_ATTRIBUTE)); if (!check_return_value(rv, "set_attribute")) GOTO_FAIL; + final: if (label != NULL) PyMem_Free(label); @@ -1927,7 +1929,8 @@ static PyObject *P11_Helper_get_attribute(P11_Helper *self, PyObject *args, attribute.ulValueLen = 0; CK_ATTRIBUTE template[] = { attribute }; - rv = self->p11->C_GetAttributeValue(self->session, object, template, 1); + rv = self->p11->C_GetAttributeValue(self->session, object, template, + sizeof(template) / sizeof(CK_ATTRIBUTE)); // attribute doesn't exists if (rv == CKR_ATTRIBUTE_TYPE_INVALID || template[0].ulValueLen == (unsigned long) -1) { @@ -1944,7 +1947,8 @@ static PyObject *P11_Helper_get_attribute(P11_Helper *self, PyObject *args, } template[0].pValue = value; - rv = self->p11->C_GetAttributeValue(self->session, object, template, 1); + rv = self->p11->C_GetAttributeValue(self->session, object, template, + sizeof(template) / sizeof(CK_ATTRIBUTE)); if (!check_return_value(rv, "get_attribute")) { GOTO_FAIL; } |