diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /crypto/dh | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/dh/dh_gen.c | 2 | ||||
| -rw-r--r-- | crypto/dh/dh_group_params.c | 6 | ||||
| -rw-r--r-- | crypto/dh/dh_lib.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index f89dd44ffd..cd318654cf 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -560,7 +560,7 @@ static int dh_pkey_import_from_type(const OSSL_PARAM params[], void *vpctx, { EVP_PKEY_CTX *pctx = vpctx; EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx); - DH *dh = dh_new_with_libctx(pctx->libctx); + DH *dh = dh_new_ex(pctx->libctx); if (dh == NULL) { ERR_raise(ERR_LIB_DH, ERR_R_MALLOC_FAILURE); diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index 52f3151bc8..096cf12886 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -100,7 +100,7 @@ static int dh_gen_named_group(OPENSSL_CTX *libctx, DH *ret, int prime_len) if (nid == NID_undef) return 0; - dh = dh_new_by_nid_with_libctx(libctx, nid); + dh = dh_new_by_nid_ex(libctx, nid); if (dh != NULL && ffc_params_copy(&ret->params, &dh->params)) { ok = 1; diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c index e0daa6ebc4..7a19f71b4d 100644 --- a/crypto/dh/dh_group_params.c +++ b/crypto/dh/dh_group_params.c @@ -103,7 +103,7 @@ const char *ffc_named_group_from_uid(int uid) static DH *dh_param_init(OPENSSL_CTX *libctx, int uid, const BIGNUM *p, const BIGNUM *q, const BIGNUM *g) { - DH *dh = dh_new_with_libctx(libctx); + DH *dh = dh_new_ex(libctx); if (dh == NULL) return NULL; @@ -136,7 +136,7 @@ static DH *dh_new_by_group_name(OPENSSL_CTX *libctx, const char *name) return NULL; } -DH *dh_new_by_nid_with_libctx(OPENSSL_CTX *libctx, int nid) +DH *dh_new_by_nid_ex(OPENSSL_CTX *libctx, int nid) { const char *name = ffc_named_group_from_uid(nid); @@ -145,7 +145,7 @@ DH *dh_new_by_nid_with_libctx(OPENSSL_CTX *libctx, int nid) DH *DH_new_by_nid(int nid) { - return dh_new_by_nid_with_libctx(NULL, nid); + return dh_new_by_nid_ex(NULL, nid); } int ffc_set_group_pqg(FFC_PARAMS *ffc, const char *group_name) diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index a6f4e64137..6c6eda27a2 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -63,7 +63,7 @@ DH *DH_new_method(ENGINE *engine) } #endif /* !FIPS_MODULE */ -DH *dh_new_with_libctx(OPENSSL_CTX *libctx) +DH *dh_new_ex(OPENSSL_CTX *libctx) { return dh_new_intern(NULL, libctx); } |