diff options
author | Matt Caswell <matt@openssl.org> | 2016-04-04 13:43:58 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
commit | 6827cb3610fee4ec8cc120cc6b5bf88b04884ae7 (patch) | |
tree | 1c2bec63a701723843db0e541fe037432336469d /crypto | |
parent | 02a247e0fa23f2caa9c10df3adf3476eb9813c95 (diff) | |
download | openssl-6827cb3610fee4ec8cc120cc6b5bf88b04884ae7.tar.gz |
Deprecate ERR_free_strings() and make it a no-op
ERR_free_strings() should not be called expicitly - we should leave
auto-deinit to clean this up instead.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/err/err.c | 4 | ||||
-rw-r--r-- | crypto/include/internal/err.h | 58 | ||||
-rw-r--r-- | crypto/init.c | 4 |
3 files changed, 4 insertions, 62 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index da6d3ee981..b937155c98 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -117,7 +117,7 @@ #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> -#include <openssl/err.h> +#include "internal/err.h" #include <openssl/opensslconf.h> static void err_load_strings(int lib, ERR_STRING_DATA *str); @@ -447,7 +447,7 @@ void ERR_unload_strings(int lib, ERR_STRING_DATA *str) CRYPTO_THREAD_unlock(err_string_lock); } -void ERR_free_strings(void) +void err_free_strings_intern(void) { CRYPTO_THREAD_run_once(&err_string_init, do_err_strings_init); diff --git a/crypto/include/internal/err.h b/crypto/include/internal/err.h deleted file mode 100644 index aa48019104..0000000000 --- a/crypto/include/internal/err.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Written by Matt Caswell for the OpenSSL project. - */ -/* ==================================================================== - * Copyright (c) 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -void err_load_crypto_strings_intern(void); diff --git a/crypto/init.c b/crypto/init.c index fe1ecd876c..3699145ac6 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -444,9 +444,9 @@ void OPENSSL_cleanup(void) if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "ERR_free_strings()\n"); + "err_free_strings_intern()\n"); #endif - ERR_free_strings(); + err_free_strings_intern(); } CRYPTO_THREAD_cleanup_local(&threadstopkey); |