From: Matt Caswell Date: Fri, 3 Oct 2014 22:48:49 +0000 (+0100) Subject: Removed duplicate definition of PKCS7_type_is_encrypted X-Git-Tag: OpenSSL_1_0_0o~16 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=13f8ddacbeaeb50d26f69e7c84feb80498cde8b6;p=oweals%2Fopenssl.git Removed duplicate definition of PKCS7_type_is_encrypted Patch supplied by Matthieu Patou , and modified to also remove duplicate definition of PKCS7_type_is_digest. PR#3551 Reviewed-by: Rich Salz (cherry picked from commit e0fdea3e49e7454aa76bd5ecf3a3747641354c68) --- diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 04f60379fb..5d54c4ac27 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -233,10 +233,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7) (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped) #define PKCS7_type_is_data(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_data) #define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) -#define PKCS7_type_is_encrypted(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted) - -#define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) #define PKCS7_set_detached(p,v) \ PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)