return NULL;
}
- ret = (STORE *)OPENSSL_malloc(sizeof(STORE));
+ ret = OPENSSL_malloc(sizeof(*ret));
if (ret == NULL) {
STOREerr(STORE_F_STORE_NEW_METHOD, ERR_R_MALLOC_FAILURE);
return NULL;
STORE_R_FAILED_GETTING_CERTIFICATE);
return 0;
}
- CRYPTO_add(&object->data.x509.certificate->references, 1,
- CRYPTO_LOCK_X509);
+ X509_up_ref(object->data.x509.certificate);
#ifdef REF_PRINT
REF_PRINT("X509", data);
#endif
return 0;
}
- CRYPTO_add(&data->references, 1, CRYPTO_LOCK_X509);
+ X509_up_ref(data);
#ifdef REF_PRINT
REF_PRINT("X509", data);
#endif
STORE_R_FAILED_LISTING_CERTIFICATES);
return 0;
}
- CRYPTO_add(&object->data.x509.certificate->references, 1,
- CRYPTO_LOCK_X509);
+ X509_up_ref(object->data.x509.certificate);
#ifdef REF_PRINT
REF_PRINT("X509", data);
#endif
STOREerr(STORE_F_STORE_GENERATE_CRL, STORE_R_FAILED_GENERATING_CRL);
return 0;
}
- CRYPTO_add(&object->data.crl->references, 1, CRYPTO_LOCK_X509_CRL);
+ X509_CRL_up_ref(object->data.crl);
#ifdef REF_PRINT
REF_PRINT("X509_CRL", data);
#endif
STOREerr(STORE_F_STORE_GET_CRL, STORE_R_FAILED_GETTING_KEY);
return 0;
}
- CRYPTO_add(&object->data.crl->references, 1, CRYPTO_LOCK_X509_CRL);
+ X509_CRL_up_ref(object->data.crl);
#ifdef REF_PRINT
REF_PRINT("X509_CRL", data);
#endif
return 0;
}
- CRYPTO_add(&data->references, 1, CRYPTO_LOCK_X509_CRL);
+ X509_CRL_up_ref(data);
#ifdef REF_PRINT
REF_PRINT("X509_CRL", data);
#endif
STOREerr(STORE_F_STORE_LIST_CRL_NEXT, STORE_R_FAILED_LISTING_KEYS);
return 0;
}
- CRYPTO_add(&object->data.crl->references, 1, CRYPTO_LOCK_X509_CRL);
+ X509_CRL_up_ref(object->data.crl);
#ifdef REF_PRINT
REF_PRINT("X509_CRL", data);
#endif
STORE_OBJECT *STORE_OBJECT_new(void)
{
- STORE_OBJECT *object = OPENSSL_malloc(sizeof(STORE_OBJECT));
+ STORE_OBJECT *object = OPENSSL_malloc(sizeof(*object));
if (object)
- memset(object, 0, sizeof(STORE_OBJECT));
+ memset(object, 0, sizeof(*object));
return object;
}
OPENSSL_free(data);
}
-IMPLEMENT_STACK_OF(STORE_OBJECT*)
-
struct STORE_attr_info_st {
unsigned char set[(STORE_ATTR_TYPE_NUM + 8) / 8];
union {
STORE_ATTR_INFO *STORE_ATTR_INFO_new(void)
{
- return (STORE_ATTR_INFO *)OPENSSL_malloc(sizeof(STORE_ATTR_INFO));
+ STORE_ATTR_INFO *p = OPENSSL_malloc(sizeof(*p));
+
+ return p;
}
static void STORE_ATTR_INFO_attr_free(STORE_ATTR_INFO *attrs,
void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes)
{
if (attributes) {
- struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)
- OPENSSL_malloc(sizeof(struct attr_list_ctx_st));
+ struct attr_list_ctx_st *context = OPENSSL_malloc(sizeof(*context));
if (context)
context->attributes = attributes;
else