diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2022-04-12 12:30:08 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2022-04-22 11:34:41 +0200 |
| commit | fba140c73541c03e22b4fdb219a05d129bf0406d (patch) | |
| tree | b5c692f73ff063c2f071ef2383979fb8aa572164 /providers/implementations/keymgmt | |
| parent | 4b2bd2722b8294a6b27c9e1fcf7d76f7d9de9b44 (diff) | |
str[n]casecmp => OPENSSL_strncasecmp
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18069)
Diffstat (limited to 'providers/implementations/keymgmt')
| -rw-r--r-- | providers/implementations/keymgmt/dsa_kmgmt.c | 3 | ||||
| -rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 1 | ||||
| -rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 4 | ||||
| -rw-r--r-- | providers/implementations/keymgmt/mac_legacy_kmgmt.c | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index 3ddafbd4c1..ec5cb5f443 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -13,7 +13,6 @@ */ #include "internal/deprecated.h" -#include "internal/e_os.h" /* strcasecmp */ #include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/bn.h> @@ -90,7 +89,7 @@ static int dsa_gen_type_name2id(const char *name) size_t i; for (i = 0; i < OSSL_NELEM(dsatype2id); ++i) { - if (strcasecmp(dsatype2id[i].name, name) == 0) + if (OPENSSL_strcasecmp(dsatype2id[i].name, name) == 0) return dsatype2id[i].id; } return -1; diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index 8a86c9108d..e72b0c3312 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -13,7 +13,6 @@ */ #include "internal/deprecated.h" -#include "internal/e_os.h" /* strcasecmp */ #include <string.h> #include <openssl/core_dispatch.h> #include <openssl/core_names.h> diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 9afcb6dc0a..333f2b7afa 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -9,8 +9,6 @@ #include <assert.h> #include <string.h> -/* For strcasecmp on Windows */ -#include "internal/e_os.h" #include <openssl/core_dispatch.h> #include <openssl/core_names.h> #include <openssl/params.h> @@ -546,7 +544,7 @@ static int ecx_gen_set_params(void *genctx, const OSSL_PARAM params[]) } if (p->data_type != OSSL_PARAM_UTF8_STRING || groupname == NULL - || strcasecmp(p->data, groupname) != 0) { + || OPENSSL_strcasecmp(p->data, groupname) != 0) { ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT); return 0; } diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c index 73af2071bf..653d9c6dc4 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -26,7 +26,6 @@ #include "prov/providercommon.h" #include "prov/provider_ctx.h" #include "prov/macsignature.h" -#include "internal/e_os.h" /* strcasecmp */ static OSSL_FUNC_keymgmt_new_fn mac_new; static OSSL_FUNC_keymgmt_free_fn mac_free; |