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:48:39 +0000 (23:48 +0100)
commit13f8ddacbeaeb50d26f69e7c84feb80498cde8b6
treeafdd34d1bf1690fcbf9d43c8b479ad96ef2441db
parentad8b2043860e7c02d6f28b5b9a4563b92f027f98
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