Removed duplicate definition of PKCS7_type_is_encrypted
authorMatt Caswell <matt@openssl.org>
Fri, 3 Oct 2014 22:48:49 +0000 (23:48 +0100)
committerJanusz Kozerski <j.kozerski@samsung.com>
Mon, 20 Oct 2014 13:26:05 +0000 (15:26 +0200)
commit43b8b2cecb8b7155e7dbfdf11d1f9d1fc3c9b4d6
tree8516c1b895a24725b311bd60c68249246aa9dc47
parente907b12f496a427389f8ce9467c157f2b26a87d2
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)
crypto/pkcs7/pkcs7.h