Removed duplicate definition of PKCS7_type_is_encrypted
authorMatt Caswell <matt@openssl.org>
Fri, 3 Oct 2014 22:48:49 +0000 (23:48 +0100)
committerMatt Caswell <matt@openssl.org>
Mon, 6 Oct 2014 22:43:49 +0000 (23:43 +0100)
commitdc7bca8bccbfe31d28a2be5e0ae8f220de8b5109
treebf280bc1c036dc2bb67ec317cf3b5a238bd7997b
parentf58cfe0422bc8a9bbeee3b9e3794df347a43d001
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