Commit 302f7588 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 0fc32b07

apps/errstr.c

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ int errstr_main(int argc, char **argv) 
        if (!opt_ulong(*argv, &l))

            ret++;

        else {

            /* We're not really an SSL application so this won't auto-init, but

             * we're still interested in SSL error strings

             */

            OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS

                             | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);

            ERR_error_string_n(l, buf, sizeof buf);

            BIO_printf(bio_out, "%s\n", buf);

        }

crypto/async/async.c

+0 −2
Original line number Diff line number Diff line
@@ -363,11 +363,9 @@ int ASYNC_init_thread(size_t max_size, size_t init_size) 
    }



    if (!OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL)) {

        ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_NOT_INITED);

        return 0;

    }

    if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ASYNC)) {

        ASYNCerr(ASYNC_F_ASYNC_INIT_THREAD, ERR_R_NOT_INITED);

        return 0;

    }

crypto/cpt_err.c

+4 −1
Original line number Diff line number Diff line 
/* ====================================================================

 * 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}

};

crypto/err/err.c

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = { 
    {ERR_R_PASSED_NULL_PARAMETER, "passed a null parameter"},

    {ERR_R_INTERNAL_ERROR, "internal error"},

    {ERR_R_DISABLED, "called a function that was disabled at compile-time"},

    {ERR_R_INIT_FAIL, "init fail"},



    {0, NULL},

};

crypto/init.c

+14 −1
Original line number Diff line number Diff line
@@ -628,8 +628,21 @@ static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting( 
 */

int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)

{

    if (stopped)

    static int stoperrset = 0;



    if (stopped) {

        if (!stoperrset) {

            /*

             * We only ever set this once to avoid getting into an infinite

             * loop where the error system keeps trying to init and fails so

             * sets an error etc

             */

            stoperrset = 1;

            CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO_LIBRARY_START,

                      ERR_R_INIT_FAIL);

        }

        return 0;

    }



    ossl_init_once_run(&base, ossl_init_base);