Patch supplied by Matthieu Patou <mat@matws.net>, and modified to also
remove duplicate definition of PKCS7_type_is_digest.

PR#3551
Reviewed-by: NRich Salz <rsalz@openssl.org>