Sophie

Sophie

distrib > Mageia > 5 > i586 > by-pkgid > e46ffa41aeae9769d79026fe023d6ab7 > files > 11

zoneminder-1.30.4-1.1.mga5.src.rpm

diff -ur ZoneMinder-1.30.0_o/src/zm_user.cpp ZoneMinder-1.30.0_n/src/zm_user.cpp
--- ZoneMinder-1.30.0_o/src/zm_user.cpp	2016-07-29 00:36:58.000000000 +0100
+++ ZoneMinder-1.30.0_n/src/zm_user.cpp	2016-08-22 12:43:12.408143016 +0100
@@ -143,6 +143,17 @@
 
   return( user );
 }
+#ifdef HAVE_GCRYPT_H
+#define HAVE_DECL_MD5 1
+#define MD5_DIGEST_LENGTH 16
+static unsigned char *MD5(const unsigned char *data, unsigned long len,
+                         unsigned char *md)
+{
+    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
+
+    return md;
+}
+#endif
 
 // Function to validate an authentication string
 User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
diff -ur ZoneMinder-1.30.0_o/src/zm_user.h ZoneMinder-1.30.0_n/src/zm_user.h
--- ZoneMinder-1.30.0_o/src/zm_user.h	2016-07-29 00:36:58.000000000 +0100
+++ ZoneMinder-1.30.0_n/src/zm_user.h	2016-08-22 12:34:00.942014265 +0100
@@ -23,18 +23,11 @@
 #ifndef ZM_USER_H
 #define ZM_USER_H
 
-#if HAVE_GNUTLS_OPENSSL_H
-#include <gnutls/openssl.h>
-#endif
-#if HAVE_GNUTLS_GNUTLS_H
-#include <gnutls/gnutls.h>
-#endif
-
 #if HAVE_GCRYPT_H
 #include <gcrypt.h>
 #elif HAVE_LIBCRYPTO
 #include <openssl/md5.h>
-#endif // HAVE_L || HAVE_LIBCRYPTO
+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
 
 class User
 {