MonetDB: embedded - not using RAND_Bytes if no openssl is present

[Hannes Muehleisen]

Changeset: 47e80ab3c08f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47e80ab3c08f
Modified Files:
        monetdb5/modules/atoms/uuid.c
        monetdb5/modules/mal/mal_mapi.c
Branch: embedded
Log Message:

not using RAND_Bytes if no openssl is present


diffs (61 lines):

diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -171,7 +171,9 @@ UUIDgenerateUuid(uuid **retval)
 #ifdef HAVE_UUID
        uuid_generate(u->u);
 #else
+#ifdef HAVE_OPENSSL
        if (RAND_bytes(u->u, 16) < 0) {
+#endif
                /* if it failed, use rand */
                int i, r;
 
@@ -180,8 +182,10 @@ UUIDgenerateUuid(uuid **retval)
                        u->u[i++] = (unsigned char) (r >> 8);
                        u->u[i++] = (unsigned char) r;
                }
+#ifdef HAVE_OPENSSL
        }
 #endif
+#endif
        return MAL_SUCCEED;
 }
 
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -36,7 +36,6 @@
 #ifdef HAVE_OPENSSL
 # include <openssl/rand.h>             /* RAND_bytes() */
 #endif
-
 #ifdef _WIN32   /* Windows specific */
 # include <winsock.h>
 #else           /* UNIX specific */
@@ -78,19 +77,25 @@ static void generateChallenge(str buf, i
 
        /* don't seed the randomiser here, or you get the same challenge
         * during the same second */
+#ifdef HAVE_OPENSSL
        if (RAND_bytes((unsigned char *) &size, (int) sizeof(size)) < 0)
+#endif
                size = rand();
        size = (size % (max - min)) + min;
+#ifdef HAVE_OPENSSL
        if (RAND_bytes((unsigned char *) buf, (int) size) >= 0) {
                for (i = 0; i < size; i++)
                        buf[i] = seedChars[((unsigned char *) buf)[i] % 62];
        } else {
+#endif
                for (i = 0; i < size; i++) {
                        bte = rand();
                        bte %= 62;
                        buf[i] = seedChars[bte];
                }
+#ifdef HAVE_OPENSSL
        }
+#endif
        buf[i] = '\0';
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list