MonetDB: Jul2021 - Even without OpenSSL can we use a backend hash.

[Sjoerd Mullender]

Changeset: 962ed5820b22 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/962ed5820b22
Modified Files:
        common/utils/mcrypt.c
        monetdb5/mal/mal_authorize.c
Branch: Jul2021
Log Message:

Even without OpenSSL can we use a backend hash.


diffs (42 lines):

diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -385,13 +385,7 @@ mcrypt_RIPEMD160Sum(const char *string, 
 char *
 mcrypt_BackendSum(const char *string, size_t len)
 {
-#if (defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO))
        return mcryptsum(MONETDB5_PASSWDHASH_TOKEN)(string, len);
-#else
-       (void) string;
-       (void) len;
-       return NULL;
-#endif
 }
 
 /**
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
@@ -1001,7 +1001,6 @@ AUTHcypherValue(str *ret, const char *va
 static str
 AUTHverifyPassword(const char *passwd)
 {
-#if (defined(HAVE_OPENSSL) || defined(HAVE_COMMONCRYPTO))
        const char *p = passwd;
        size_t len = strlen(p);
 
@@ -1021,13 +1020,6 @@ AUTHverifyPassword(const char *passwd)
        }
 
        return(MAL_SUCCEED);
-#else
-       if (GDKembedded())
-               return(MAL_SUCCEED);
-       (void) passwd;
-       throw(MAL, "verifyPassword", "Unknown backend hash algorithm: %s",
-                 MONETDB5_PASSWDHASH);
-#endif
 }
 
 static BUN
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list