diff options
| author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-10-15 12:55:50 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:59:53 +0100 |
| commit | b425001010044adbdbcd98f8682694b30b73bbf4 (patch) | |
| tree | e87a5b512d7869cb6a500ecc74b706281be762cf /crypto/bn | |
| parent | 29000e43ea257bf54f6ccb2064b3744853b821b2 (diff) | |
Rename OPENSSL_CTX prefix to OSSL_LIB_CTX
Many of the new types introduced by OpenSSL 3.0 have an OSSL_ prefix,
e.g., OSSL_CALLBACK, OSSL_PARAM, OSSL_ALGORITHM, OSSL_SERIALIZER.
The OPENSSL_CTX type stands out a little by using a different prefix.
For consistency reasons, this type is renamed to OSSL_LIB_CTX.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12621)
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn_ctx.c | 8 | ||||
| -rw-r--r-- | crypto/bn/bn_rand.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c index d6c55cb16c..86a9538cb8 100644 --- a/crypto/bn/bn_ctx.c +++ b/crypto/bn/bn_ctx.c @@ -87,7 +87,7 @@ struct bignum_ctx { /* Flags. */ int flags; /* The library context */ - OPENSSL_CTX *libctx; + OSSL_LIB_CTX *libctx; }; #ifndef FIPS_MODULE @@ -128,7 +128,7 @@ static void ctxdbg(BIO *channel, const char *text, BN_CTX *ctx) # define CTXDBG(str, ctx) do {} while(0) #endif /* FIPS_MODULE */ -BN_CTX *BN_CTX_new_ex(OPENSSL_CTX *ctx) +BN_CTX *BN_CTX_new_ex(OSSL_LIB_CTX *ctx) { BN_CTX *ret; @@ -150,7 +150,7 @@ BN_CTX *BN_CTX_new(void) } #endif -BN_CTX *BN_CTX_secure_new_ex(OPENSSL_CTX *ctx) +BN_CTX *BN_CTX_secure_new_ex(OSSL_LIB_CTX *ctx) { BN_CTX *ret = BN_CTX_new_ex(ctx); @@ -249,7 +249,7 @@ BIGNUM *BN_CTX_get(BN_CTX *ctx) return ret; } -OPENSSL_CTX *bn_get_lib_ctx(BN_CTX *ctx) +OSSL_LIB_CTX *bn_get_lib_ctx(BN_CTX *ctx) { if (ctx == NULL) return NULL; diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index e603bb7030..4208f2d4d8 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -25,7 +25,7 @@ static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom, { unsigned char *buf = NULL; int b, ret = 0, bit, bytes, mask; - OPENSSL_CTX *libctx = bn_get_lib_ctx(ctx); + OSSL_LIB_CTX *libctx = bn_get_lib_ctx(ctx); if (bits == 0) { if (top != BN_RAND_TOP_ANY || bottom != BN_RAND_BOTTOM_ANY) @@ -254,7 +254,7 @@ int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range, unsigned char *k_bytes = NULL; int ret = 0; EVP_MD *md = NULL; - OPENSSL_CTX *libctx = bn_get_lib_ctx(ctx); + OSSL_LIB_CTX *libctx = bn_get_lib_ctx(ctx); if (mdctx == NULL) goto err; |