Hello, 1.0.1x and master (at least) have a warning about duplicated definition of PKCS7_type_is_encrypted
Please find attached a patch that fix the issue in the master git branch. Would be nice to have this fix for master backported to 1.0.1x and 1.0.2x Matthieu ?
>From 2994e3d2a557526c1c34c676bceff3b411f2e962 Mon Sep 17 00:00:00 2001 From: Matthieu Patou <[email protected]> Date: Tue, 30 Sep 2014 12:46:18 -0700 Subject: [PATCH] Removed duplicated and identical definition of PKCS7_type_is_encrypted Signed-off-by: Matthieu Patou <[email protected]> --- crypto/pkcs7/pkcs7.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 44f1758..0df7a41 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -233,8 +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) -- 1.9.1
