Changeset: c88ab11c3676 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c88ab11c3676
Modified Files:
common/utils/mcrypt.c
monetdb5/mal/mal_authorize.c
Branch: default
Log Message:
Don't provide digest functions in embedded mode.
That is even if OpenSSL/CommonCrypto is available -- they are then
only used for random number generation.
diffs (156 lines):
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -13,6 +13,8 @@
#include "mcrypt.h"
#include <string.h>
+#ifndef HAVE_EMBEDDED
+/* only provide digest functions if not embedded */
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#include <openssl/sha.h>
@@ -23,6 +25,7 @@
#include <CommonCrypto/CommonDigest.h>
#endif
#endif
+#endif
/**
* Returns a comma separated list of supported hash algorithms suitable
@@ -40,7 +43,7 @@ mcrypt_getHashAlgorithms(void)
* Better/stronger/faster algorithms can be added in the future upon
* desire.
*/
-#if defined(HAVE_RIPEMD160_UPDATE) || defined(HAVE_SHA256_UPDATE) ||
defined(HAVE_SHA1_UPDATE) || defined(HAVE_MD5_UPDATE)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_RIPEMD160_UPDATE) ||
defined(HAVE_SHA256_UPDATE) || defined(HAVE_SHA1_UPDATE) ||
defined(HAVE_MD5_UPDATE))
return strdup(
#ifdef HAVE_RIPEMD160_UPDATE
"RIPEMD160"
@@ -78,7 +81,7 @@ mcrypt_getHashAlgorithms(void)
char *
mcrypt_MD5Sum(const char *string, size_t len)
{
-#ifdef HAVE_MD5_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_MD5_UPDATE)
MD5_CTX c;
unsigned char md[MD5_DIGEST_LENGTH];
char *ret;
@@ -114,7 +117,7 @@ mcrypt_MD5Sum(const char *string, size_t
char *
mcrypt_SHA1Sum(const char *string, size_t len)
{
-#ifdef HAVE_SHA1_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_SHA1_UPDATE)
SHA_CTX c;
unsigned char md[SHA_DIGEST_LENGTH];
char *ret;
@@ -150,7 +153,7 @@ mcrypt_SHA1Sum(const char *string, size_
char *
mcrypt_SHA224Sum(const char *string, size_t len)
{
-#ifdef HAVE_SHA224_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_SHA224_UPDATE)
SHA256_CTX c;
unsigned char md[SHA224_DIGEST_LENGTH];
char *ret;
@@ -189,7 +192,7 @@ mcrypt_SHA224Sum(const char *string, siz
char *
mcrypt_SHA256Sum(const char *string, size_t len)
{
-#ifdef HAVE_SHA256_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_SHA256_UPDATE)
SHA256_CTX c;
unsigned char md[SHA256_DIGEST_LENGTH];
char *ret;
@@ -230,7 +233,7 @@ mcrypt_SHA256Sum(const char *string, siz
char *
mcrypt_SHA384Sum(const char *string, size_t len)
{
-#ifdef HAVE_SHA384_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_SHA384_UPDATE)
SHA512_CTX c;
unsigned char md[SHA384_DIGEST_LENGTH];
char *ret;
@@ -275,7 +278,7 @@ mcrypt_SHA384Sum(const char *string, siz
char *
mcrypt_SHA512Sum(const char *string, size_t len)
{
-#ifdef HAVE_SHA512_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_SHA512_UPDATE)
SHA512_CTX c;
unsigned char md[SHA512_DIGEST_LENGTH];
char *ret;
@@ -325,7 +328,7 @@ mcrypt_SHA512Sum(const char *string, siz
char *
mcrypt_RIPEMD160Sum(const char *string, size_t len)
{
-#ifdef HAVE_RIPEMD160_UPDATE
+#if !defined(HAVE_EMBEDDED) && defined(HAVE_RIPEMD160_UPDATE)
RIPEMD160_CTX c;
unsigned char md[RIPEMD160_DIGEST_LENGTH];
char *ret;
@@ -363,7 +366,7 @@ mcrypt_RIPEMD160Sum(const char *string,
char *
mcrypt_BackendSum(const char *string, size_t len)
{
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_OPENSSL) ||
defined(HAVE_COMMONCRYPTO))
return mcryptsum(MONETDB5_PASSWDHASH_TOKEN)(string, len);
#else
(void) string;
@@ -387,7 +390,7 @@ mcrypt_hashPassword(
const char *password,
const char *challenge)
{
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_OPENSSL) ||
defined(HAVE_COMMONCRYPTO))
unsigned char md[64]; /* should be SHA512_DIGEST_LENGTH */
char ret[sizeof(md) * 2 + 1];
int len;
@@ -489,7 +492,7 @@ mcrypt_hashPassword(
return NULL;
}
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_OPENSSL) ||
defined(HAVE_COMMONCRYPTO))
snprintf(ret, sizeof(ret),
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -26,6 +26,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifndef HAVE_EMBEDDED
#ifdef HAVE_OPENSSL
#include <openssl/md5.h>
#include <openssl/sha.h>
@@ -36,6 +37,7 @@
#include <CommonCrypto/CommonDigest.h>
#endif
#endif
+#endif
static str AUTHdecypherValue(str *ret, str *value);
static str AUTHcypherValue(str *ret, str *value);
@@ -762,7 +764,7 @@ AUTHcypherValue(str *ret, str *value)
static str
AUTHverifyPassword(str *passwd)
{
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_OPENSSL) ||
defined(HAVE_COMMONCRYPTO))
char *p = *passwd;
size_t len = strlen(p);
@@ -778,7 +780,7 @@ AUTHverifyPassword(str *passwd)
throw(MAL, "verifyPassword", "Unknown backend hash algorithm:
%s",
MONETDB5_PASSWDHASH);
}
-#if defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO)
+#if !defined(HAVE_EMBEDDED) && (defined(HAVE_OPENSSL) ||
defined(HAVE_COMMONCRYPTO))
len++; // required in case all the checks above are false
while (*p != '\0') {
if (!((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9')))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
