yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add generic OPERATION_NOT_SUPPORTED error code.

Browse Source 
Implementations of ENGINEs often don't want to implement every function.
This change adds an error code for those situations.

Change-Id: Id6b7eace36d06ffad7f347f556d942d447d8a2fd
Reviewed-on: https://boringssl-review.googlesource.com/1920
Reviewed-by: Wan-Teh Chang <wtc@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2014-10-09 16:26:09 -07:00
parent bc8d737807
commit 7ea848165b
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/engine/CMakeLists.txt
View File

@ -6,4 +6,5 @@ add_library(
OBJECT
engine.c
engine_error.c
)

3
crypto/engine/engine.c
View File

@ -17,6 +17,7 @@
#include <openssl/dh.h>
#include <openssl/dsa.h>
#include <openssl/ec_key.h>
#include <openssl/err.h>
#include <openssl/mem.h>
#include <openssl/rsa.h>
#include <openssl/thread.h>
@ -131,3 +132,5 @@ void METHOD_unref(void *method_in) {
OPENSSL_free(method);
}
}
OPENSSL_DECLARE_ERROR_REASON(ENGINE, OPERATION_NOT_SUPPORTED);

22
crypto/engine/engine_error.c Normal file
View File

@ -0,0 +1,22 @@
/* Copyright (c) 2014, Google Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <openssl/err.h>
#include <openssl/engine.h>
const ERR_STRING_DATA ENGINE_error_string_data[] = {
{ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_OPERATION_NOT_SUPPORTED), "OPERATION_NOT_SUPPORTED"},
{0, NULL},
};

2
crypto/err/err.c
View File

@ -699,6 +699,7 @@ extern const ERR_STRING_DATA DSA_error_string_data[];
extern const ERR_STRING_DATA ECDH_error_string_data[];
extern const ERR_STRING_DATA ECDSA_error_string_data[];
extern const ERR_STRING_DATA EC_error_string_data[];
extern const ERR_STRING_DATA ENGINE_error_string_data[];
extern const ERR_STRING_DATA EVP_error_string_data[];
extern const ERR_STRING_DATA OBJ_error_string_data[];
extern const ERR_STRING_DATA PEM_error_string_data[];
@ -752,6 +753,7 @@ static void err_load_strings(void) {
ERR_load_strings(ECDH_error_string_data);
ERR_load_strings(ECDSA_error_string_data);
ERR_load_strings(EC_error_string_data);
ERR_load_strings(ENGINE_error_string_data);
ERR_load_strings(EVP_error_string_data);
ERR_load_strings(OBJ_error_string_data);
ERR_load_strings(PEM_error_string_data);

2
include/openssl/engine.h
View File

@ -100,4 +100,6 @@ struct openssl_method_common_st {
} /* extern C */
#endif
#define ENGINE_R_OPERATION_NOT_SUPPORTED 100
#endif /* OPENSSL_HEADER_ENGINE_H */