kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define compatibility function |ERR_remove_state|.

Browse Source 
(It was already declared.)

Change-Id: Ifcda07fe85a6d5d9e2d3b5c387793413f5048515
Reviewed-on: https://boringssl-review.googlesource.com/4713
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Matt Braithwaite 2015-05-06 13:57:29 -07:00 committed by Adam Langley
parent 2607383e72
commit 9b68e72d18
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/err/err.c
View File

@ -333,6 +333,10 @@ int ERR_get_next_error_library(void) {
return ret; return ret;
} }
void ERR_remove_state(unsigned long pid) {
ERR_clear_error();
}
void ERR_clear_system_error(void) { void ERR_clear_system_error(void) {
errno = 0; errno = 0;
} }

21
include/openssl/err.h
View File

@ -269,11 +269,11 @@ OPENSSL_EXPORT void ERR_print_errors_fp(FILE *file);
OPENSSL_EXPORT void ERR_clear_error(void); OPENSSL_EXPORT void ERR_clear_error(void);
/* ERR_remove_thread_state clears the error queue for the current thread if /* ERR_remove_thread_state clears the error queue for the current thread if
* |tid| is NULL. Otherwise it does nothing because it's no longer possible to * |tid| is NULL. Otherwise it calls |assert(0)|, because it's no longer
* delete the error queue for other threads. * possible to delete the error queue for other threads.
* *
* Error queues are thread-local data and are deleted automatically. You do not * Error queues are thread-local data and are deleted automatically. You do not
* need to call this function. See |ERR_clear_error|. */ * need to call this function. Use |ERR_clear_error|. */
OPENSSL_EXPORT void ERR_remove_thread_state(const CRYPTO_THREADID *tid); OPENSSL_EXPORT void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
@ -285,6 +285,12 @@ OPENSSL_EXPORT void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
OPENSSL_EXPORT int ERR_get_next_error_library(void); OPENSSL_EXPORT int ERR_get_next_error_library(void);
/* Deprecated functions. */
/* |ERR_remove_state| calls |ERR_clear_error|. */
OPENSSL_EXPORT void ERR_remove_state(unsigned long pid);
/* Private functions. */ /* Private functions. */
/* ERR_clear_system_error clears the system's error value (i.e. errno). */ /* ERR_clear_system_error clears the system's error value (i.e. errno). */
@ -496,15 +502,6 @@ enum {
#define OPENSSL_DECLARE_ERROR_FUNCTION(lib, function_name) #define OPENSSL_DECLARE_ERROR_FUNCTION(lib, function_name)
/* Android compatibility section.
*
* These functions are declared, temporarily, for Android because
* wpa_supplicant will take a little time to sync with upstream. Outside of
* Android they'll have no definition. */
OPENSSL_EXPORT void ERR_remove_state(unsigned long pid);
#if defined(__cplusplus) #if defined(__cplusplus)
} /* extern C */ } /* extern C */
#endif #endif