OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/libcrypto/pkcs7/verify.c b/src/lib/libcrypto/pkcs7/verify.c
index 32d9783e45..49fc8d8bed 100644
--- a/src/lib/libcrypto/pkcs7/verify.c
+++ b/src/lib/libcrypto/pkcs7/verify.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
+#include <string.h>
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
@@ -84,10 +85,18 @@ char *argv[];
 
         bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
         bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+#ifndef NO_MD2
         EVP_add_digest(EVP_md2());
+#endif
+#ifndef NO_MD5
         EVP_add_digest(EVP_md5());
+#endif
+#ifndef NO_SHA1
         EVP_add_digest(EVP_sha1());
+#endif
+#ifndef NO_MDC2
         EVP_add_digest(EVP_mdc2());
+#endif
 
         data=BIO_new(BIO_s_file());
 
@@ -121,7 +130,7 @@ char *argv[];
 
 
         /* Load the PKCS7 object from a file */
-        if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL)) == NULL) goto err;
+        if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL,NULL)) == NULL) goto err;
 
         /* This stuff is being setup for certificate verification.
          * When using SSL, it could be replaced with a