diff options
author | David Benjamin <davidben@chromium.org> | 2015-04-15 23:46:09 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-04-16 02:27:22 +0300 |
commit | 546f1a59ef24798defa0c94df5f0040c5be54b42 (patch) | |
tree | 4c78485adcbdd95ea0b596e93650987823ff24e7 /include/openssl/ex_data.h | |
parent | b857ffe62925f0d76d658177c26ab8c4c1340b95 (diff) |
Unexpose the generic ex_data functions.
Callers are required to use the wrappers now. They still need OPENSSL_EXPORT
since crypto and ssl get built separately in the standalone shared library
build.
Change-Id: I61186964e6099b9b589c4cd45b8314dcb2210c89
Reviewed-on: https://boringssl-review.googlesource.com/4372
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'include/openssl/ex_data.h')
-rw-r--r-- | include/openssl/ex_data.h | 127 |
1 files changed, 39 insertions, 88 deletions
diff --git a/include/openssl/ex_data.h b/include/openssl/ex_data.h index abf96a3f..fa9de398 100644 --- a/include/openssl/ex_data.h +++ b/include/openssl/ex_data.h @@ -119,21 +119,51 @@ extern "C" { /* ex_data is a mechanism for associating arbitrary extra data with objects. - * The different types of objects which can have data associated with them are - * called "classes" and there are predefined classes for all the OpenSSL - * objects that support ex_data. - * - * Within a given class, different users can be assigned indexes in which to - * store their data. Each index has callback functions that are called when a - * new object of that type is created, freed and duplicated. */ + * For each type of object that supports ex_data, different users can be + * assigned indexes in which to store their data. Each index has callback + * functions that are called when a new object of that type is created, freed + * and duplicated. */ typedef struct crypto_ex_data_st CRYPTO_EX_DATA; + +/* Type-specific functions. + * + * Each type that supports ex_data provides three functions: */ + +#if 0 /* Sample */ + +/* |TYPE_get_ex_new_index| allocates a new index for |TYPE|. See the + * descriptions of the callback typedefs for details of when they are + * called. Any of the callback arguments may be NULL. The |argl| and |argp| + * arguments are opaque values that are passed to the callbacks. It returns the + * new index or a negative number on error. + * + * TODO(fork): this should follow the standard calling convention. */ +OPENSSL_EXPORT int TYPE_get_ex_new_index(long argl, void *argp, + CRYPTO_EX_new *new_func, + CRYPTO_EX_dup *dup_func, + CRYPTO_EX_free *free_func); + +/* |TYPE_set_ex_data| sets an extra data pointer on |t|. The |index| argument + * should have been returned from a previous call to |TYPE_get_ex_new_index|. */ +OPENSSL_EXPORT int TYPE_set_ex_data(TYPE *t, int index, void *arg); + +/* |TYPE_get_ex_data| returns an extra data pointer for |t|, or NULL if no such + * pointer exists. The |index| argument should have been returned from a + * previous call to |TYPE_get_ex_new_index|. */ +OPENSSL_EXPORT void *TYPE_get_ex_data(const TYPE *t, int index); + +#endif /* Sample */ + + +/* Callback types. */ + /* CRYPTO_EX_new is the type of a callback function that is called whenever a * new object of a given class is created. For example, if this callback has - * been passed to |CRYPTO_get_ex_new_index| with a |class| of - * |CRYPTO_EX_INDEX_SSL| then it'll be called each time an SSL* is created. + * been passed to |SSL_get_ex_new_index| then it'll be called each time an SSL* + * is created. * * The callback is passed the new object (i.e. the SSL*) in |parent|. The * arguments |argl| and |argp| contain opaque values that were given to @@ -166,85 +196,6 @@ typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, void **from_d, int index, long argl, void *argp); -/* CRYPTO_get_ex_new_index allocates a new index for ex_data linked with - * objects of the given |class|. This should not be called directly, rather - * each class of object should provide a wrapper function that sets - * |class_value| correctly. - * - * The |class_value| argument should be one of |CRYPTO_EX_INDEX_*|. - * - * See the descriptions of the callback typedefs for details of when they are - * called. Any of the callback arguments may be NULL. The |argl| and |argp| - * arguments are opaque values that are passed to the callbacks. - * - * It returns the new index, or a negative number on error. - * - * TODO(fork): this should follow the standard calling convention. - * - * TODO(fork): replace the class_value with a pointer to EX_CLASS_ITEM. Saves - * having that hash table and some of the lock-bouncing. Maybe have every - * module have a private global EX_CLASS_ITEM somewhere and any direct callers - * of CRYPTO_{get,set}_ex_data{,_index} would have to always call the - * wrappers. */ -OPENSSL_EXPORT int CRYPTO_get_ex_new_index(int class_value, long argl, - void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, - CRYPTO_EX_free *free_func); - -/* CRYPTO_set_ex_data sets an extra data pointer on a given object. This should - * not be called directly, rather each class of object should provide a wrapper - * function. - * - * The |index| argument should have been returned from a previous call to - * |CRYPTO_get_ex_new_index|. */ -OPENSSL_EXPORT int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, void *val); - -/* CRYPTO_set_ex_data return an extra data pointer for a given object, or NULL - * if no such index exists. This should not be called directly, rather each - * class of object should provide a wrapper function. - * - * The |index| argument should have been returned from a previous call to - * |CRYPTO_get_ex_new_index|. */ -OPENSSL_EXPORT void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int index); - -/* CRYPTO_EX_INDEX_* are the built-in classes of objects. - * - * TODO(fork): WARNING: these are called "INDEX", but they aren't! */ -enum { - CRYPTO_EX_INDEX_BIO, - CRYPTO_EX_INDEX_SSL, - CRYPTO_EX_INDEX_SSL_CTX, - CRYPTO_EX_INDEX_SSL_SESSION, - CRYPTO_EX_INDEX_X509_STORE, - CRYPTO_EX_INDEX_X509_STORE_CTX, - CRYPTO_EX_INDEX_RSA, - CRYPTO_EX_INDEX_DSA, - CRYPTO_EX_INDEX_DH, - CRYPTO_EX_INDEX_X509, - CRYPTO_EX_INDEX_EC_KEY, -}; - - -/* Embedding, allocating and freeing |CRYPTO_EX_DATA| structures for objects - * that embed them. */ - -/* CRYPTO_new_ex_data initialises a newly allocated |CRYPTO_EX_DATA| which is - * embedded inside of |obj| which is of class |class_value|. Returns one on - * success and zero otherwise. */ -OPENSSL_EXPORT int CRYPTO_new_ex_data(int class_value, void *obj, - CRYPTO_EX_DATA *ad); - -/* CRYPTO_dup_ex_data duplicates |from| into a freshly allocated - * |CRYPTO_EX_DATA|, |to|. Both of which are inside objects of the given - * class. It returns one on success and zero otherwise. */ -OPENSSL_EXPORT int CRYPTO_dup_ex_data(int class_value, CRYPTO_EX_DATA *to, - const CRYPTO_EX_DATA *from); - -/* CRYPTO_free_ex_data frees |ad|, which is embedded inside |obj|, which is an - * object of the given class. */ -OPENSSL_EXPORT void CRYPTO_free_ex_data(int class_value, void *obj, - CRYPTO_EX_DATA *ad); - /* Private functions. */ |