Changeset 12502

Timestamp:

Mar 19, 2007, 3:13:54 PM (19 years ago)

Author:

Paul Price

Message:

Pulling out openssl/crypto dependency (we've had SO much trouble getting it to behave with us) in favour of libmd5-rfc. I put the source code (from sourceforge.net/projects/libmd5-rfc/) directly into the tree, because the original distribution doesn't build a library, and we don't want the user to have to go and grab it. The license (zlib/libpng) is compatible with the GPL, so no problems there. Changed the source code a little bit so that it behaves a little bit better with 32/64 bit issues ('unsigned int' --> 'uint32_t'), and got it to use the autoconf WORDS_BIGENDIAN flag.

Location:

trunk/psLib

Files:

• configure.ac (modified) (2 diffs)
• src/math/Makefile.am (modified) (2 diffs)
• src/math/md5.c (added)
• src/math/md5.h (added)
• src/math/psMD5.c (modified) (4 diffs)

trunk/psLib/configure.ac

@@ -84 +84 @@
 dnl check the systems endianness
 AC_C_BIGENDIAN
+
+dnl set NO_STRCASESTR if we can't find strcasestr
+AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 AC_PREFIX_DEFAULT([/usr/local])
@@ -409 +412 @@
 LDFLAGS=${TMP_LDFLAGS}
 CPPFLAGS=${TMP_CPPFLAGS}
-
-dnl ------- openssl ---------
-
-dnl save LIBS/CFLAGS/LDFLAGS
-TMP_LIBS=${LIBS}
-TMP_CFLAGS=${CFLAGS}
-TMP_LDFLAGS=${LDFLAGS}
-TMP_CPPFLAGS=${CPPFLAGS}
-
-AC_ARG_WITH(ssl,
-[AS_HELP_STRING(--with-ssl=DIR,Specify location of SSL.)],
-[SSL_CFLAGS="-I$withval/include"
- SSL_LDFLAGS="-L$withval/lib"])
-AC_ARG_WITH(ssl-include,
-[AS_HELP_STRING(--with-ssl-include=DIR,Specify SSL include directory.)],
-[SSL_CFLAGS="-I$withval"])
-AC_ARG_WITH(ssl-lib,
-[AS_HELP_STRING(--with-ssl-lib=DIR,Specify SSL library directory.)],
-[SSL_LDFLAGS="-L$withval"])
-
-CFLAGS="${CFLAGS} ${SSL_CFLAGS}"
-CPPFLAGS=${CFLAGS}
-LDFLAGS="${LDFLAGS} ${SSL_LIBS}"
-
-AC_CHECK_HEADERS([openssl/md5.h],[],
-        [AC_CHECK_HEADERS([sys/md5.h],[],
-                [AC_MSG_ERROR([SSL headers not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
-        )]
-)
-AC_CHECK_LIB(crypto,MD5,[],
-  [AC_MSG_ERROR([SSL library not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
-)
-
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${SSL_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} ${SSL_LDFLAGS=} ${LIBS}"
-
-AC_SUBST([SSL_CFLAGS])
-AC_SUBST([SSL_LDFLAGS])
-
-dnl restore the CFLAGS/LDFLAGS
-LIBS=${TMP_LIBS}
-CFLAGS=${TMP_CFLAGS}
-LDFLAGS=${TMP_LDFLAGS}
-CPPFLAGS=${TMP_CPPFLAGS}
-
-dnl set NO_STRCASESTR if we can't find strcasestr
-AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 dnl ------- enable -Werror after all of the probes have run ---------

trunk/psLib/src/math/Makefile.am

@@ -26 +26 @@
         psStats.c \
         psHistogram.c \
-        psVectorSmooth.c
+        psVectorSmooth.c \
+        md5.c
 
 EXTRA_DIST = math.i
@@ -55 +56 @@
         psVectorSmooth.h
 
+noinst_HEADERS = \
+        md5.h
+
 CLEANFILES = *~ *.bb *.bbg *.da

trunk/psLib/src/math/psMD5.c

@@ -6 +6 @@
 #include <string.h>
 
-#ifdef HAVE_SYS_MD5_H
-// Seems to be the case for Solaris
-#include <sys/md5.h>
-#else
-// Seems to be the case for most others
-#include <openssl/md5.h>
-#endif // HAVE_SYS_MD5_H
-
+#include "md5.h"
 
 #include "psAssert.h"
@@ -24 +17 @@
 
 
+#define MD5_DIGEST_LENGTH 16            // Length of an MD5 digest, in bytes
+
 psVector *psStringMD5(const char *string)
 {
     psVector *hash = psVectorAlloc(MD5_DIGEST_LENGTH, PS_TYPE_U8); // The resultant MD5 hash
-    if (!MD5((const unsigned char *)string, strlen(string), &hash->data.U8[0])) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate md5 hash.\n");
-        psFree(hash);
-        return NULL;
-    }
+    md5_state_t buffer;                 // Calculation buffer
+    md5_init(&buffer);
+    md5_append(&buffer, (psU8*)string, strlen(string));
+    md5_finish(&buffer, &hash->data.U8[0]);
     return hash;
 }
@@ -40 +34 @@
 
     psVector *hash = psVectorAlloc(MD5_DIGEST_LENGTH, PS_TYPE_U8); // The resultant MD5 hash
-    if (!MD5(vector->data.U8, vector->n * PSELEMTYPE_SIZEOF(vector->type.type), &hash->data.U8[0])) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate md5 hash.\n");
-        psFree(hash);
-        return NULL;
-    }
+    md5_state_t buffer;                 // Calculation buffer
+    md5_init(&buffer);
+    md5_append(&buffer, vector->data.U8, vector->n * PSELEMTYPE_SIZEOF(vector->type.type));
+    md5_finish(&buffer, &hash->data.U8[0]);
     return hash;
 }
@@ -54 +47 @@
 
     psVector *hash = psVectorAlloc(MD5_DIGEST_LENGTH, PS_TYPE_U8); // The resultant MD5 hash
+    md5_state_t buffer;                 // Calculation buffer
+    md5_init(&buffer);
     if (!image->parent) {
         // No parent means image is contiguous
-        if (!MD5(&image->data.U8[0][0], image->numCols * image->numRows * PSELEMTYPE_SIZEOF(image->type.type),
-                 &hash->data.U8[0])) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate md5 hash.\n");
-            psFree(hash);
-            return NULL;
+        md5_append(&buffer, image->data.U8[0],
+                   image->numCols * image->numRows * PSELEMTYPE_SIZEOF(image->type.type));
+    } else {
+        for (int row = 0; row < image->numRows; row++) {
+            md5_append(&buffer, image->data.U8[row],
+                       image->numCols * PSELEMTYPE_SIZEOF(image->type.type));
         }
-    } else {
-        MD5_CTX ctx;                    // MD5 calculator
-        MD5_Init(&ctx);
-        for (int row = 0; row < image->numRows; row++) {
-            MD5_Update(&ctx, image->data.U8[row], image->numCols * PSELEMTYPE_SIZEOF(image->type.type));
-        }
-        MD5_Final(&hash->data.U8[0], &ctx);
     }
+    md5_finish(&buffer, &hash->data.U8[0]);
 
     return hash;