Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 77615297b80a869988b51c3dca828459 > files > 3

heimdal-1.3.2-3mdv2010.1.src.rpm

diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h
--- heimdal-1.3.2/include/crypto-headers.h	2010-03-22 05:11:24.000000000 +0100
+++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h	2010-04-28 14:54:53.000000000 +0200
@@ -13,7 +13,9 @@
 #include <openssl/des.h>
 #include <openssl/rc4.h>
 #include <openssl/rc2.h>
+#ifdef HAVE_OPENSSL_MD2_H
 #include <openssl/md2.h>
+#endif
 #include <openssl/md4.h>
 #include <openssl/md5.h>
 #include <openssl/sha.h>
diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c
--- heimdal-1.3.2/lib/hx509/crypto.c	2010-03-22 05:11:24.000000000 +0100
+++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c	2010-04-28 15:12:20.000000000 +0200
@@ -1354,6 +1354,7 @@
     NULL
 };
 
+#ifdef HAVE_OPENSSL_MD2_H
 static const struct signature_alg md2_alg = {
     "rsa-md2",
     &asn1_oid_id_rsa_digest_md2,
@@ -1366,6 +1367,7 @@
     evp_md_verify_signature,
     NULL
 };
+#endif
 
 /*
  * Order matter in this structure, "best" first for each "key
@@ -1387,7 +1389,9 @@
     &sha256_alg,
     &sha1_alg,
     &md5_alg,
+#ifdef HAVE_OPENSSL_MD2_H
     &md2_alg,
+#endif
     NULL
 };