The branch master has been updated
via 748eb991f49585a609ec65b0d8d26835a2911045 (commit)
from 86a92bcb13a843f820fae7f1a4c78a6e654fe069 (commit)
- Log -----------------------------------------------------------------
commit 748eb991f49585a609ec65b0d8d26835a2911045
Author: Dr. Matthias St. Pierre <[email protected]>
Date: Tue Jun 5 23:22:06 2018 +0200
RAND_POOL: Add missing implementations for djgpp
Calling the functions rand_pool_add_{additional,nonce}_data()
in crypto/rand/rand_lib.c with no implementation for djgpp/MSDOS
causees unresolved symbols when linking with djgpp.
Reported and fixed by Gisle Vanem
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/6421)
-----------------------------------------------------------------------
Summary of changes:
crypto/rand/rand_unix.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 7989081..fafa359 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -27,7 +27,8 @@
#if defined(__OpenBSD__) || defined(__NetBSD__)
# include <sys/param.h>
#endif
-#ifdef OPENSSL_SYS_UNIX
+
+#if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
# include <sys/types.h>
# include <unistd.h>
# include <sys/time.h>
@@ -70,7 +71,7 @@ static uint64_t get_timer_bits(void);
# define OSSL_POSIX_TIMER_OKAY
# endif
# endif
-#endif
+#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
int syscall_random(void *buf, size_t buflen);
@@ -392,7 +393,7 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool)
# endif
#endif
-#ifdef OPENSSL_SYS_UNIX
+#if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
int rand_pool_add_nonce_data(RAND_POOL *pool)
{
struct {
@@ -512,4 +513,4 @@ static uint64_t get_timer_bits(void)
# endif
return time(NULL);
}
-#endif
+#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
