diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-10-18 12:24:39 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2019-10-23 08:31:21 -0400 |
| commit | d318389eff0fb80d4a88c7af1cc314f185ba94e1 (patch) | |
| tree | 5ffff2fcd93266313ffefc4d24585609c7350104 /include | |
| parent | c89799605b833f769ce4cfd879bb291f49b133be (diff) | |
Document "get/set-app-data" macros.
Documenting the macros removes 14 undocumented items.
Merged three separate manpages into one.
Rename the DRBG CRYPTO_EX define into RAND_DRBG, but keep the old one
for API compatibility.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10216)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 3 | ||||
| -rw-r--r-- | include/openssl/rand_drbg.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 7a74f3d4eb..28c8939e96 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -113,7 +113,8 @@ DEFINE_STACK_OF(void) # define CRYPTO_EX_INDEX_BIO 12 # define CRYPTO_EX_INDEX_APP 13 # define CRYPTO_EX_INDEX_UI_METHOD 14 -# define CRYPTO_EX_INDEX_DRBG 15 +# define CRYPTO_EX_INDEX_RAND_DRBG 15 +# define CRYPTO_EX_INDEX_DRBG CRYPTO_EX_INDEX_RAND_DRBG # define CRYPTO_EX_INDEX_OPENSSL_CTX 16 # define CRYPTO_EX_INDEX__COUNT 17 diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h index 0aef0da5a3..f52e5ee041 100644 --- a/include/openssl/rand_drbg.h +++ b/include/openssl/rand_drbg.h @@ -123,7 +123,7 @@ RAND_DRBG *RAND_DRBG_get0_private(void); * EXDATA */ # define RAND_DRBG_get_ex_new_index(l, p, newf, dupf, freef) \ - CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DRBG, l, p, newf, dupf, freef) + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RAND_DRBG, l, p, newf, dupf, freef) int RAND_DRBG_set_ex_data(RAND_DRBG *drbg, int idx, void *arg); void *RAND_DRBG_get_ex_data(const RAND_DRBG *drbg, int idx); |