diff options
Diffstat (limited to 'ckcapi-cert.c')
| -rw-r--r-- | ckcapi-cert.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ckcapi-cert.c b/ckcapi-cert.c index 4fe1d41..e7edde7 100644 --- a/ckcapi-cert.c +++ b/ckcapi-cert.c @@ -40,12 +40,6 @@ typedef struct _CertObject /* Together these can uniquely identify a certificate */ CRYPT_INTEGER_BLOB serial; CERT_NAME_BLOB issuer; - - /* - * This must stay together. It comprises a unique - * key, together with the data that runs off the end. - */ - int otype; } CertObject; @@ -85,7 +79,7 @@ parse_basic_constraints(CertObjectData* cdata, CK_ULONG* category) return ckcapi_winerr_to_ckr(GetLastError()); /* Allocate enough memory */ - basic = (CERT_BASIC_CONSTRAINTS_INFO*)calloc(size, 1); + basic = (CERT_BASIC_CONSTRAINTS_INFO*)calloc(1, size); if(!basic) return CKR_HOST_MEMORY; @@ -294,7 +288,7 @@ cert_alloc_data(CkCapiSession* sess, CkCapiObject* obj, PCCERT_CONTEXT cert) { CertObjectData* cdata; - cdata = (CertObjectData*)calloc(sizeof(CertObjectData), 1); + cdata = (CertObjectData*)calloc(1, sizeof(CertObjectData)); if(!cdata) return NULL; @@ -596,15 +590,10 @@ register_cert_object(CkCapiSession* sess, PCCERT_CONTEXT cert, CkCapiObject** ob len = cert->pCertInfo->SerialNumber.cbData + cert->pCertInfo->Issuer.cbData; - /* Add one in case null termination is needed */ - len++; - - cobj = calloc(sizeof(CertObject) + len, 1); + cobj = calloc(1, sizeof(CertObject) + len); if(!cobj) return CKR_HOST_MEMORY; - cobj->otype = OBJECT_CERT; - cobj->obj.id = 0; cobj->obj.obj_funcs = &cert_object_vtable; |