From: Dr. Stephen Henson Date: Thu, 2 Dec 2010 18:02:14 +0000 (+0000) Subject: PR: 2386 X-Git-Tag: OpenSSL_1_0_1-beta1~409 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=411a388c620d2615293dfe4b9dec4ea902df33cc;p=oweals%2Fopenssl.git PR: 2386 Submitted by: Stefan Birrer Reviewed by: steve Correct SKM_ASN1_SET_OF_d2i macro. --- diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index 891cb84a51..e46b8a408f 100644 --- a/crypto/stack/safestack.h +++ b/crypto/stack/safestack.h @@ -179,7 +179,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) sk_is_sorted(CHECKED_STACK_OF(type, st)) #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ - (STACK_OF(type) *)d2i_ASN1_SET((STACK_OF(OPENSSL_BLOCK) **)CHECKED_STACK_OF(type, st), \ + (STACK_OF(type) *)d2i_ASN1_SET( \ + (STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \ pp, length, \ CHECKED_D2I_OF(type, d2i_func), \ CHECKED_SK_FREE_FUNC(type, free_func), \