Fix BN_[pseudo_]rand: 'mask' must be used even if top=-1.

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 2da89e2112e6f68af12d8b91e2882529f6e67af3..db3fe030a153d9c8ee28da6052ac7940b6fbf75b 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -79,11 +79,11 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-#ifdef NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 BIO_METHOD *BIO_s_file();
 #endif
 
-#ifdef WIN32
+#ifdef OPENSSL_SYS_WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
 #endif
@@ -118,19 +118,20 @@ extern BIO *bio_err;
 #if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup()       do_pipe_sig()
 #else
-#  if defined(MSDOS) || defined(WIN16) || defined(WIN32)
+#  if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
+   defined(OPENSSL_SYS_WIN32)
 #    ifdef _O_BINARY
 #      define apps_startup() \
                _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-               SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
+               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    else
 #      define apps_startup() \
                _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-               SSLeay_add_all_algorithms(); ENGINE_load_builtin_engines()
+               OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines()
 #    endif
 #  else
 #    define apps_startup() \
-               do_pipe_sig(); SSLeay_add_all_algorithms(); \
+               do_pipe_sig(); OpenSSL_add_all_algorithms(); \
                ENGINE_load_builtin_engines()
 #  endif
 #endif