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:46:25 +0000 (23:46 +0100)
commitbf3e200eb4bd180169bb2caa8472e1533692fb9f
treebbc5045636f5c37306c128965f9df3b1637a69c1
parent55614f89f0beb53ebafbfc680cf7b4d114b44d30
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