Changeset: 1dd003263ef2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1dd003263ef2
Modified Files:
common/utils/mcrypt.c
tools/embedded/Makefile.ag
tools/reverserapi/R/monetdb.R
Branch: embedded
Log Message:
Stub for mcrypt lib if no OpenSSL is found
diffs (131 lines):
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -12,11 +12,12 @@
#endif
#include "mcrypt.h"
#include <string.h>
+
+#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#include <openssl/sha.h>
#include <openssl/ripemd.h>
-
/**
* Returns a comma separated list of supported hash algorithms suitable
* for final hashing by the client. This list contains the smaller
@@ -378,3 +379,84 @@ mcrypt_hashPassword(
return strdup(ret);
}
+
+#else /* in embedded mode, we don't do MAPI or vaults, therefore we can run
without OpenSSL. One build dependency down. */
+
+#define NO_OPENSSL_FATAL "MonetDB was built without OpenSSL, but what you are
trying to do requires it."
+
+char* mcrypt_sum_fail(const char *string, size_t len) {
+ (void)string;
+ (void)len;
+ GDKfatal(NO_OPENSSL_FATAL);
+ return NULL;
+}
+
+char *
+mcrypt_getHashAlgorithms(void)
+{
+ GDKfatal(NO_OPENSSL_FATAL);
+ return NULL;
+}
+
+char *
+mcrypt_MD5Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_SHA1Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+
+char *
+mcrypt_SHA224Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_SHA256Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_SHA384Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_SHA512Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_RIPEMD160Sum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_BackendSum(const char *string, size_t len)
+{
+ return mcrypt_sum_fail(string, len);
+}
+
+char *
+mcrypt_hashPassword(
+ const char *algo,
+ const char *password,
+ const char *challenge)
+{
+ (void)algo;
+ (void)password;
+ (void)challenge;
+ GDKfatal(NO_OPENSSL_FATAL);
+ return NULL;
+}
+#endif
diff --git a/tools/embedded/Makefile.ag b/tools/embedded/Makefile.ag
--- a/tools/embedded/Makefile.ag
+++ b/tools/embedded/Makefile.ag
@@ -30,13 +30,13 @@ INCLUDES = ../../monetdb5/mal \
../../sql/common \
../../sql/storage \
../../sql/backends/monet5 \
- $(openssl_CFLAGS) $(pcre_CFLAGS) $(libxml2_CFLAGS)
+ $(pcre_CFLAGS)
lib_embedded = {
SOURCES = embedded.c embedded.h
VERSION = 1
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
- $(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB) \
+ $(pcre_LIBS) $(PSAPILIB) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(DL_LIBS) $(PTHREAD_LIBS)
}
diff --git a/tools/reverserapi/R/monetdb.R b/tools/reverserapi/R/monetdb.R
--- a/tools/reverserapi/R/monetdb.R
+++ b/tools/reverserapi/R/monetdb.R
@@ -43,5 +43,5 @@ monetdb_embedded_query <- function(query
resp$type <- 1 # Q_TABLE
resp$tuples <- as.data.frame(res, stringsAsFactors=F)
}
- invisible(resp)
+ resp
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
