diff options
author | Rich Salz <rsalz@akamai.com> | 2016-02-13 14:20:43 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 14:46:17 -0500 |
commit | 040d43b3ff8daca32dd0f72155f668249506b51b (patch) | |
tree | c074fb38ae2fa87825901dd703a1d6d6cdddb69a /crypto | |
parent | c7f1fa8ec0c022e5014ef45348e869f9d8781327 (diff) |
OpenSSLDie --> OPENSSL_die
Also removed a bunch of unused define's from e_os.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/cryptlib.c | 7 | ||||
-rw-r--r-- | crypto/rand/randfile.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 8052893db2..e41a6fc117 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 1a06c4ecac..a5b2b7f162 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 |