diff options
| author | Matt Caswell <matt@openssl.org> | 2014-10-03 23:48:49 +0100 |
|---|---|---|
| committer | Janusz Kozerski <j.kozerski@samsung.com> | 2014-10-20 15:26:05 +0200 |
| commit | 43b8b2cecb8b7155e7dbfdf11d1f9d1fc3c9b4d6 (patch) | |
| tree | 8516c1b895a24725b311bd60c68249246aa9dc47 | |
| parent | e907b12f496a427389f8ce9467c157f2b26a87d2 (diff) | |
| download | openssl-43b8b2cecb8b7155e7dbfdf11d1f9d1fc3c9b4d6.tar.gz openssl-43b8b2cecb8b7155e7dbfdf11d1f9d1fc3c9b4d6.tar.bz2 openssl-43b8b2cecb8b7155e7dbfdf11d1f9d1fc3c9b4d6.zip | |
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: Rich Salz <rsalz@openssl.org>
(cherry picked from commit e0fdea3e49e7454aa76bd5ecf3a3747641354c68)
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 04f6037..5d54c4a 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) |