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

Add ERR_get_next_error_library back.

Browse Source 
It was removed in the fork but it turned out to need it.

Change-Id: I21030c8d5befecb63f2c40a59963bec1da1d96fb
Reviewed-on: https://boringssl-review.googlesource.com/1081
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2014-07-01 16:48:28 -07:00 committed by Adam Langley
parent 2b0aeecabf
commit 4042667eb9
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/err/err.c
View File

@ -271,6 +271,11 @@ void ERR_clear_error(void) {
state->top = state->bottom = 0; state->top = state->bottom = 0;
} }
int ERR_get_next_error_library() {
err_fns_check();
return ERRFN(get_next_library)();
}
void ERR_clear_system_error(void) { void ERR_clear_system_error(void) {
errno = 0; errno = 0;
} }

13
crypto/err/err.h
View File

@ -254,6 +254,14 @@ void ERR_print_errors_cb(ERR_print_errors_callback_t callback, void *ctx);
void ERR_clear_error(void); void ERR_clear_error(void);
/* Custom errors. */
/* ERR_get_next_error_library returns a value suitable for passing as the
* |library| argument to |ERR_put_error|. This is intended for code that wishes
* to push its own, non-standard errors to the error queue. */
int ERR_get_next_error_library();
/* 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). */
@ -467,6 +475,11 @@ struct ERR_FNS_st {
/* get_state returns the ERR_STATE for the current thread. This function /* get_state returns the ERR_STATE for the current thread. This function
* never returns NULL. */ * never returns NULL. */
ERR_STATE *(*get_state)(void); ERR_STATE *(*get_state)(void);
/* get_next_library returns a unique value suitable for passing as the
* |library| to error calls. It will be distinct from all built-in library
* values. */
int (*get_next_library)(void);
}; };
/* OPENSSL_DECLARE_ERROR_REASON is used by util/make_errors.h (which generates /* OPENSSL_DECLARE_ERROR_REASON is used by util/make_errors.h (which generates

14
crypto/err/err_impl.c
View File

@ -125,6 +125,9 @@ static LHASH_OF(ERR_STATE) *state_hash = NULL;
* function / reason. */ * function / reason. */
static LHASH_OF(ERR_STRING_DATA) *error_hash = NULL; static LHASH_OF(ERR_STRING_DATA) *error_hash = NULL;
/* global_next_library contains the next custom library value to return. */
static int global_next_library = ERR_NUM_LIBS;
/* err_string_data_hash is an lhash hash function for ERR_STRING_DATA. */ /* err_string_data_hash is an lhash hash function for ERR_STRING_DATA. */
static uint32_t err_string_data_hash(const ERR_STRING_DATA *a) { static uint32_t err_string_data_hash(const ERR_STRING_DATA *a) {
return OPENSSL_hash32(&a->error, sizeof(a->error)); return OPENSSL_hash32(&a->error, sizeof(a->error));
@ -271,10 +274,21 @@ static void err_shutdown(void) {
CRYPTO_w_unlock(CRYPTO_LOCK_ERR); CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
} }
static int err_get_next_library(void) {
int ret;
CRYPTO_w_lock(CRYPTO_LOCK_ERR);
ret = global_next_library++;
CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
return ret;
}
const struct ERR_FNS_st openssl_err_default_impl = { const struct ERR_FNS_st openssl_err_default_impl = {
err_shutdown, err_shutdown,
err_get_item, err_get_item,
err_set_item, err_set_item,
err_del_item, err_del_item,
err_get_state, err_get_state,
err_get_next_library,
}; };