Commit e0fdea3e authored by Matt Caswell's avatar Matt Caswell
Browse files

Removed duplicate definition of PKCS7_type_is_encrypted 



Patch supplied by Matthieu Patou <mat@matws.net>, and modified to also
remove duplicate definition of PKCS7_type_is_digest.

PR#3551

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 71614df4

crypto/pkcs7/pkcs7.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -233,10 +233,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7) 
		(OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)

		(OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)

#define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)

#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_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) \

#define PKCS7_set_detached(p,v) \

		PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)

		PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)