diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-10 16:16:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-10 18:40:59 +0100 |
| commit | 302f75887e52bbe0ab7a5806335a0a1264323b07 (patch) | |
| tree | 704e3638b402a89e064f6cde7d893ad8b687581e /crypto/cpt_err.c | |
| parent | The new init functions can now fail so shouldn't be void (diff) | |
| download | openssl-302f75887e52bbe0ab7a5806335a0a1264323b07.tar.xz openssl-302f75887e52bbe0ab7a5806335a0a1264323b07.zip | |
Attempt to log an error if init failed
If init failed we'd like to set an error code to indicate that. But if
init failed then when the error system tries to load its strings its going
to fail again. We could get into an infinite loop. Therefore we just set
a single error the first time around. After that no error is set.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/cpt_err.c')
| -rw-r--r-- | crypto/cpt_err.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c index 46bd9c82d6..d1e4b33b5c 100644 --- a/crypto/cpt_err.c +++ b/crypto/cpt_err.c @@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -84,6 +84,9 @@ static ERR_STRING_DATA CRYPTO_str_functs[] = { {ERR_FUNC(CRYPTO_F_INT_DUP_EX_DATA), "INT_DUP_EX_DATA"}, {ERR_FUNC(CRYPTO_F_INT_FREE_EX_DATA), "INT_FREE_EX_DATA"}, {ERR_FUNC(CRYPTO_F_INT_NEW_EX_DATA), "INT_NEW_EX_DATA"}, + {ERR_FUNC(CRYPTO_F_OPENSSL_INIT_CRYPTO_LIBRARY_START), + "OPENSSL_INIT_crypto_library_start"}, + {ERR_FUNC(CRYPTO_F_OPENSSL_MEMDUP), "OPENSSL_MEMDUP"}, {0, NULL} }; |