diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-12-06 14:36:04 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-01-11 18:27:27 +0100 |
| commit | 18cfc668eae2c296e9bc90ffc989d9bbe61cc82f (patch) | |
| tree | a54dec7ebd83cfcf54da1338590299a15702c767 /include | |
| parent | a223ffe6d35209c59ed498ee89d1bac6e82e2ac2 (diff) | |
Add an application data field in the UI_METHOD
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2204)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 3 | ||||
| -rw-r--r-- | include/openssl/ui.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index bd0b140827..8ee3e8aec6 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -110,7 +110,8 @@ DEFINE_STACK_OF(void) # define CRYPTO_EX_INDEX_UI 11 # define CRYPTO_EX_INDEX_BIO 12 # define CRYPTO_EX_INDEX_APP 13 -# define CRYPTO_EX_INDEX__COUNT 14 +# define CRYPTO_EX_INDEX_UI_METHOD 14 +# define CRYPTO_EX_INDEX__COUNT 15 /* * This is the default callbacks, but we can have others as well: this is diff --git a/include/openssl/ui.h b/include/openssl/ui.h index b4b182ff8a..ff25205505 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -284,6 +284,7 @@ int UI_method_set_prompt_constructor(UI_METHOD *method, *object_desc, const char *object_name)); +int UI_method_set_ex_data(UI_METHOD *method, int idx, void *data); int (*UI_method_get_opener(const UI_METHOD *method)) (UI *); int (*UI_method_get_writer(const UI_METHOD *method)) (UI *, UI_STRING *); int (*UI_method_get_flusher(const UI_METHOD *method)) (UI *); @@ -291,6 +292,7 @@ int (*UI_method_get_reader(const UI_METHOD *method)) (UI *, UI_STRING *); int (*UI_method_get_closer(const UI_METHOD *method)) (UI *); char *(*UI_method_get_prompt_constructor(const UI_METHOD *method)) (UI *, const char *, const char *); +const void *UI_method_get_ex_data(const UI_METHOD *method, int idx); /* * The following functions are helpers for method writers to access relevant |