[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Tue Mar 8 19:49:41 UTC 2016
The branch master has been updated
via 040d43b3ff8daca32dd0f72155f668249506b51b (commit)
from c7f1fa8ec0c022e5014ef45348e869f9d8781327 (commit)
- Log -----------------------------------------------------------------
commit 040d43b3ff8daca32dd0f72155f668249506b51b
Author: Rich Salz <rsalz at akamai.com>
Date: Sat Feb 13 14:20:43 2016 -0500
OpenSSLDie --> OPENSSL_die
Also removed a bunch of unused define's from e_os.h
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/cryptlib.c | 7 +++----
crypto/rand/randfile.c | 2 +-
e_os.h | 26 ++------------------------
include/openssl/crypto.h | 8 ++++++--
util/libcrypto.num | 2 +-
5 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 8052893..e41a6fc 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -449,11 +449,10 @@ int OPENSSL_isservice(void)
}
#endif
-void OpenSSLDie(const char *file, int line, const char *assertion)
+void OPENSSL_die(const char *message, const char *file, int line)
{
- OPENSSL_showfatal
- ("%s(%d): OpenSSL internal error, assertion failed: %s\n", file, line,
- assertion);
+ OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n",
+ file, line, message);
#if !defined(_WIN32) || defined(__CYGWIN__)
abort();
#else
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 1a06c4e..a5b2b7f 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -103,7 +103,7 @@ static FILE *(*const vms_fopen)(const char *, const char *, ...) =
# define VMS_OPEN_ATTRS "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0"
#endif
-/* #define RFILE ".rnd" - defined in ../../e_os.h */
+#define RFILE ".rnd"
/*
* Note that these functions are intended for seed files only. Entropy
diff --git a/e_os.h b/e_os.h
index 41ab7bb..d2ae1ec 100644
--- a/e_os.h
+++ b/e_os.h
@@ -82,7 +82,7 @@ extern "C" {
# if defined(REF_DEBUG)
# define REF_ASSERT_ISNT(test) \
- (void)((test) ? (OpenSSLDie(__FILE__, __LINE__, "refcount error"), 1) : 0)
+ (void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
# else
# define REF_ASSERT_ISNT(i)
# endif
@@ -94,6 +94,7 @@ extern "C" {
# endif
# define osslargused(x) (void)x
+# define OPENSSL_CONF "openssl.cnf"
# ifndef DEVRANDOM
/*
@@ -337,9 +338,6 @@ extern FILE *_imp___iob;
# ifndef R_OK
# define R_OK 4
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define NUL_DEV "nul"
-# define RFILE ".rnd"
# ifdef OPENSSL_SYS_WINCE
# define DEFAULT_HOME ""
# else
@@ -369,10 +367,7 @@ extern FILE *_imp___iob;
# else
# include <unixlib.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ','
-# define NUL_DEV "NLA0:"
/* We don't have any well-defined random devices on VMS, yet... */
# undef DEVRANDOM
/*-
@@ -422,8 +417,6 @@ extern int kbhit(void);
# define _kbhit kbhit
# define _O_TEXT O_TEXT
# define _O_BINARY O_BINARY
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ';'
# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
@@ -442,15 +435,10 @@ extern int kbhit(void);
# include <fcntl.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':'
-# define NUL_DEV "/dev/null"
# define EXIT(n) exit(n)
# endif
-# define OpenSSL_getpid() getpid()
-
# endif
/*************/
@@ -464,8 +452,6 @@ extern int kbhit(void);
/* windows world */
# ifdef OPENSSL_NO_SOCK
-# define OpenSSL_Write(a,b,c) (-1)
-# define OpenSSL_Read(a,b,c) (-1)
# elif !defined(__DJGPP__)
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
@@ -491,11 +477,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# define socket(d,t,p) ((int)socket(d,t,p))
# define accept(s,f,l) ((int)accept(s,f,l))
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
# else
-# define OpenSSL_Write(a,b,c) write_s(a,b,c,0)
-# define OpenSSL_Read(a,b,c) read_s(a,b,c)
# endif
# elif defined(OPENSSL_SYS_NETWARE)
@@ -517,8 +499,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# else
# include <novsock2.h>
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
# else
@@ -578,8 +558,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# endif
# endif
-# define OpenSSL_Read(a,b,c) read((a),(b),(c))
-# define OpenSSL_Write(a,b,c) write((a),(b),(c))
# ifndef INVALID_SOCKET
# define INVALID_SOCKET (-1)
# endif /* INVALID_SOCKET */
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 41eac25..2969e2e 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -482,8 +482,12 @@ int CRYPTO_mem_leaks(struct bio_st *bio);
# endif
/* die if we have to */
-void OpenSSLDie(const char *file, int line, const char *assertion);
-# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1))
+# if OPENSSL_API_COMPAT < 0x10100000L
+# define OpenSSLDie(f,l,a) OPENSSL_die((a),(f),(l))
+# endif
+void OPENSSL_die(const char *assertion, const char *file, int line);
+# define OPENSSL_assert(e) \
+ (void)((e) ? 0 : (OPENSSL_die("assertion failed: " #e, OPENSSL_FILE, OPENSSL_LINE), 1))
unsigned int *OPENSSL_ia32cap_loc(void);
# define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0])
diff --git a/util/libcrypto.num b/util/libcrypto.num
index eec16a7..3afb06f 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -2473,7 +2473,7 @@ ASN1_item_ex_free 2391 1_1_0 EXIST::FUNCTION:
X509_SIG_new 2392 1_1_0 EXIST::FUNCTION:
BN_sqr 2393 1_1_0 EXIST::FUNCTION:
TS_TST_INFO_set_time 2394 1_1_0 EXIST::FUNCTION:
-OpenSSLDie 2395 1_1_0 EXIST::FUNCTION:
+OPENSSL_die 2395 1_1_0 EXIST::FUNCTION:
X509_LOOKUP_by_alias 2396 1_1_0 EXIST::FUNCTION:
EC_KEY_set_conv_form 2397 1_1_0 EXIST::FUNCTION:EC
CRYPTO_lock 2398 1_1_0 EXIST::FUNCTION:
More information about the openssl-commits
mailing list