Ticket #26813: macports-1.9.2.patch

src/pextlib1.0/md5cmd.c

@@ -44 +44 @@
 
 #include "md5cmd.h"
 
-#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
+#if HAVE_COMMONCRYPTO_COMMONDIGEST_H || defined(HAVE_LIBCRYPTO)
 
+#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
 #define COMMON_DIGEST_FOR_OPENSSL
 #include <CommonCrypto/CommonDigest.h>
+#endif
+
+#if defined(HAVE_LIBCRYPTO)
+#include <stdio.h> 
+#include <openssl/md5.h>
+#endif
 
 /* md5 functions are named differently */
 #define MD5Init(x) MD5_Init(x)
@@ -62 +69 @@
 #include <sys/types.h>
 #include <md5.h>
 #else
-#error CommonCrypto or libmd required
+#error CommonCrypto, OpenSSL (libcrypto) or libmd required
 #endif
 
 int MD5Cmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])

src/pextlib1.0/sha1cmd.c

@@ -45 +45 @@
 
 #include "sha1cmd.h"
 
-#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
+#if HAVE_COMMONCRYPTO_COMMONDIGEST_H || defined(HAVE_LIBCRYPTO)
 
+#if HAVE_COMMONCRYPTO_COMMONDIGEST_H
 #define COMMON_DIGEST_FOR_OPENSSL
 #include <CommonCrypto/CommonDigest.h>
-
 #include "md_wrappers.h"
 CHECKSUMEnd(SHA1_, SHA_CTX, SHA_DIGEST_LENGTH)
 CHECKSUMFile(SHA1_, SHA_CTX)
+#endif
+
+#if defined(HAVE_LIBCRYPTO)
+#include <stdio.h>
+#include <openssl/sha.h>
+#define SHA1Init(x) SHA1_Init(x)
+#define SHA1Update(x,y,z) SHA1_Update(x,y,z)
+#define SHA1Final(x,y) SHA1_Final(x,y)
+#define SHA1_File(x,y) SHA1File(x,y)
+#include "md_wrappers.h"
+CHECKSUMEnd(SHA1, SHA_CTX, SHA_DIGEST_LENGTH)
+CHECKSUMFile(SHA1, SHA_CTX)
+#endif
+
 
 #elif defined(HAVE_LIBMD)
 #include <sys/types.h>
@@ -60 +73 @@
 #define SHA_DIGEST_LENGTH (SHA_HASHBYTES)
 #define SHA1_File(x,y) SHAFile(x,y)
 #else
-#error CommonCrypto or libmd required
+#error CommonCrypto, OpenSSL (libcrypto) or libmd required
 #endif
 
 int SHA1Cmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])

src/pextlib1.0/sha256cmd.c

@@ -44 +44 @@
 
 #include "sha256cmd.h"
 
+#if HAVE_COMMONCRYPTO_COMMONDIGEST_H || defined(HAVE_LIBCRYPTO)
+
 #if HAVE_COMMONCRYPTO_COMMONDIGEST_H
 
 #define COMMON_DIGEST_FOR_OPENSSL
@@ -58 +60 @@
 #define SHA256_Final(m, c)              CC_SHA256_Final(m,c)
 #endif
 
+#include "md_wrappers.h"
+CHECKSUMEnd(SHA256_, SHA256_CTX, SHA256_DIGEST_LENGTH)
+CHECKSUMFile(SHA256_, SHA256_CTX)
+#endif
+
+#if defined(HAVE_LIBCRYPTO)
+#include <stdio.h>
+#include <openssl/sha.h>
+#define SHA256Init(x) SHA256_Init(x) 
+#define SHA256Update(x,y,z) SHA256_Update(x,y,z) 
+#define SHA256Final(x,y) SHA256_Final(x,y)
+#define SHA256_File(x,y) SHA256File(x,y)
+#include "md_wrappers.h"
+CHECKSUMEnd(SHA256, SHA256_CTX, SHA256_DIGEST_LENGTH)
+CHECKSUMFile(SHA256, SHA256_CTX)
+#endif
+
 #else
 /* We do not have CommonCrypto.
 * let's use our own version of sha256* libraries.
@@ -65 +82 @@
 #include <sys/types.h>
 #include "sha2.h"
 #include "sha2.c"
-#endif
-
 #include "md_wrappers.h"
 CHECKSUMEnd(SHA256_, SHA256_CTX, SHA256_DIGEST_LENGTH)
 CHECKSUMFile(SHA256_, SHA256_CTX)
+#endif
 
 int SHA256Cmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {

aclocal.m4

@@ -540 +540 @@
                         AC_MSG_ERROR([libmd was found, but md5.h is missing.])
                 ])
                 AC_DEFINE([HAVE_LIBMD], ,[Define if you have the `md' library (-lmd).])
-                MD5_LIBS="-lmd"]
-        )
+                MD5_LIBS="-lmd"
+        ])
         if test "x$MD5_LIBS" = "x"; then
-                AC_MSG_ERROR([Neither CommonCrypto nor libmd were found. A working md5 implementation is required.])
+                AC_CHECK_LIB([crypto], [MD5_Update], [
+                        AC_CHECK_HEADERS([openssl/md5.h], , [
+                                AC_MSG_ERROR([OpenSSL's libcrypto was found, but the openssl/md5.h header file is missing.])
+                        ])
+                        AC_DEFINE([HAVE_LIBCRYPTO],,[Define if you have the `crypto' library (-lcrypto).])
+                        MD5_LIBS="-lcrypto"
+                ])
+        fi
+        if test "x$MD5_LIBS" = "x"; then
+                AC_MSG_ERROR([Neither CommonCrypto nor libmd nor OpenSSL's libcrypto were found. A working md5 implementation is required.])
         fi
         AC_SUBST([MD5_LIBS])
 ])

src/config.h.in

@@ -83 +83 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
 /* Define if you have the `md' library (-lmd). */
 #undef HAVE_LIBMD
 
@@ -110 +113 @@
 /* Define to 1 if you have the <objc/objc.h> header file. */
 #undef HAVE_OBJC_OBJC_H
 
+/* Define to 1 if you have the <openssl/md5.h> header file. */
+#undef HAVE_OPENSSL_MD5_H
+
 /* Define to 1 if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H
 

configure

@@ -8417 +8411 @@
 fi
 
         if test "x$MD5_LIBS" = "x"; then
-                as_fn_error $? "Neither CommonCrypto nor libmd were found. A working md5 implementation is required." "$LINENO" 5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5_Update in -lcrypto" >&5
+$as_echo_n "checking for MD5_Update in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_MD5_Update+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD5_Update ();
+int
+main ()
+{
+return MD5_Update ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_MD5_Update=yes
+else
+  ac_cv_lib_crypto_MD5_Update=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5_Update" >&5
+$as_echo "$ac_cv_lib_crypto_MD5_Update" >&6; }
+if test "x$ac_cv_lib_crypto_MD5_Update" = xyes; then :
+
+                        for ac_header in openssl/md5.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/md5.h" "ac_cv_header_openssl_md5_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_md5_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_MD5_H 1
+_ACEOF
+
+else
+
+                                as_fn_error $? "OpenSSL's libcrypto was found, but the openssl/md5.h header file is missing." "$LINENO" 5
+
+fi
+
+done
+
+
+$as_echo "#define HAVE_LIBCRYPTO /**/" >>confdefs.h
+
+                        MD5_LIBS="-lcrypto"
+
+fi
+
+        fi
+        if test "x$MD5_LIBS" = "x"; then
+                as_fn_error $? "Neither CommonCrypto nor libmd nor OpenSSL's libcrypto were found. A working md5 implementation is required." "$LINENO" 5
         fi