diff options
author | Pauli <paul.dale@oracle.com> | 2020-09-28 12:47:04 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-09-29 16:33:16 +1000 |
commit | 7d6766cb537e5cebc99e200bc537f744878a87a4 (patch) | |
tree | db9fbd45925e6735deb25b4b1a44771a107c003e /providers/implementations/ciphers | |
parent | 1be63951f87dfcbc98efe5d94a15298fea885890 (diff) |
prov: prefix provider internal functions with ossl_
Also convert the names to lower case.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13014)
Diffstat (limited to 'providers/implementations/ciphers')
70 files changed, 141 insertions, 136 deletions
diff --git a/providers/implementations/ciphers/cipher_aes.h b/providers/implementations/ciphers/cipher_aes.h index f2ee746295..2fa96582ce 100644 --- a/providers/implementations/ciphers/cipher_aes.h +++ b/providers/implementations/ciphers/cipher_aes.h @@ -51,12 +51,12 @@ typedef struct prov_aes_ctx_st { } PROV_AES_CTX; -#define PROV_CIPHER_HW_aes_ofb PROV_CIPHER_HW_aes_ofb128 -#define PROV_CIPHER_HW_aes_cfb PROV_CIPHER_HW_aes_cfb128 -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_ecb(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_cbc(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_ofb128(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_cfb128(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_cfb1(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_cfb8(size_t keybits); -const PROV_CIPHER_HW *PROV_CIPHER_HW_aes_ctr(size_t keybits); +#define ossl_prov_cipher_hw_aes_ofb ossl_prov_cipher_hw_aes_ofb128 +#define ossl_prov_cipher_hw_aes_cfb ossl_prov_cipher_hw_aes_cfb128 +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ecb(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_cbc(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ofb128(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_cfb128(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_cfb1(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_cfb8(size_t keybits); +const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ctr(size_t keybits); diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c index 1d499d9555..16916fdc47 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c @@ -308,7 +308,7 @@ static void *aes_cbc_hmac_sha1_newctx(void *provctx, size_t kbits, ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) base_init(provctx, &ctx->base_ctx, - PROV_CIPHER_HW_aes_cbc_hmac_sha1(), kbits, blkbits, + ossl_prov_cipher_hw_aes_cbc_hmac_sha1(), kbits, blkbits, ivbits, flags); return ctx; } @@ -335,7 +335,7 @@ static void *aes_cbc_hmac_sha256_newctx(void *provctx, size_t kbits, ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) base_init(provctx, &ctx->base_ctx, - PROV_CIPHER_HW_aes_cbc_hmac_sha256(), kbits, blkbits, + ossl_prov_cipher_hw_aes_cbc_hmac_sha256(), kbits, blkbits, ivbits, flags); return ctx; } diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h index 73d39bbc42..75c450c350 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h @@ -26,8 +26,8 @@ typedef struct prov_cipher_hw_aes_hmac_sha_ctx_st { # endif /* OPENSSL_NO_MULTIBLOCK) */ } PROV_CIPHER_HW_AES_HMAC_SHA; -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha1(void); -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha256(void); +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void); +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void); #ifdef AES_CBC_HMAC_SHA_CAPABLE # include <openssl/aes.h> diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c index 12644e780f..b3aebbe052 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c @@ -22,7 +22,7 @@ int cipher_capable_aes_cbc_hmac_sha1(void) return 0; } -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha1(void) +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void) { return NULL; } @@ -788,7 +788,7 @@ static const PROV_CIPHER_HW_AES_HMAC_SHA cipher_hw_aes_hmac_sha1 = { # endif }; -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha1(void) +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void) { return &cipher_hw_aes_hmac_sha1; } diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c index 35106e0171..8e738bcd10 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c @@ -22,7 +22,7 @@ int cipher_capable_aes_cbc_hmac_sha256(void) return 0; } -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha256(void) +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void) { return NULL; } @@ -837,7 +837,7 @@ static const PROV_CIPHER_HW_AES_HMAC_SHA cipher_hw_aes_hmac_sha256 = { # endif }; -const PROV_CIPHER_HW_AES_HMAC_SHA *PROV_CIPHER_HW_aes_cbc_hmac_sha256(void) +const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void) { return &cipher_hw_aes_hmac_sha256; } diff --git a/providers/implementations/ciphers/cipher_aes_ccm.c b/providers/implementations/ciphers/cipher_aes_ccm.c index 52bdd784d0..5913b2ce0c 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm.c +++ b/providers/implementations/ciphers/cipher_aes_ccm.c @@ -29,7 +29,7 @@ static void *aes_ccm_newctx(void *provctx, size_t keybits) ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) - ccm_initctx(&ctx->base, keybits, PROV_AES_HW_ccm(keybits)); + ccm_initctx(&ctx->base, keybits, ossl_prov_aes_hw_ccm(keybits)); return ctx; } diff --git a/providers/implementations/ciphers/cipher_aes_ccm.h b/providers/implementations/ciphers/cipher_aes_ccm.h index ee0257c5f6..2c3ebd0950 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm.h +++ b/providers/implementations/ciphers/cipher_aes_ccm.h @@ -45,4 +45,4 @@ typedef struct prov_aes_ccm_ctx_st { } ccm; } PROV_AES_CCM_CTX; -const PROV_CCM_HW *PROV_AES_HW_ccm(size_t keylen); +const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keylen); diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw.c b/providers/implementations/ciphers/cipher_aes_ccm_hw.c index db2e3f2742..db50187ea9 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm_hw.c +++ b/providers/implementations/ciphers/cipher_aes_ccm_hw.c @@ -62,7 +62,7 @@ static const PROV_CCM_HW aes_ccm = { #elif defined(SPARC_AES_CAPABLE) # include "cipher_aes_ccm_hw_t4.inc" #else -const PROV_CCM_HW *PROV_AES_HW_ccm(size_t keybits) +const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits) { return &aes_ccm; } diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw_aesni.inc b/providers/implementations/ciphers/cipher_aes_ccm_hw_aesni.inc index 7e83565809..12b2bfe96b 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm_hw_aesni.inc +++ b/providers/implementations/ciphers/cipher_aes_ccm_hw_aesni.inc @@ -32,7 +32,7 @@ static const PROV_CCM_HW aesni_ccm = { ccm_generic_gettag }; -const PROV_CCM_HW *PROV_AES_HW_ccm(size_t keybits) +const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits) { return AESNI_CAPABLE ? &aesni_ccm : &aes_ccm; } diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw_s390x.inc b/providers/implementations/ciphers/cipher_aes_ccm_hw_s390x.inc index cec7c96902..9a9f12875f 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm_hw_s390x.inc +++ b/providers/implementations/ciphers/cipher_aes_ccm_hw_s390x.inc @@ -258,7 +258,7 @@ static const PROV_CCM_HW s390x_aes_ccm = { s390x_aes_ccm_gettag }; -const PROV_CCM_HW *PROV_AES_HW_ccm(size_t keybits) +const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits) { if ((keybits == 128 && S390X_aes_128_ccm_CAPABLE) || (keybits == 192 && S390X_aes_192_ccm_CAPABLE) diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw_t4.inc b/providers/implementations/ciphers/cipher_aes_ccm_hw_t4.inc index c4b6d15ed9..f81f422d5a 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm_hw_t4.inc +++ b/providers/implementations/ciphers/cipher_aes_ccm_hw_t4.inc @@ -30,7 +30,7 @@ static const PROV_CCM_HW t4_aes_ccm = { ccm_generic_gettag }; -const PROV_CCM_HW *PROV_AES_HW_ccm(size_t keybits) +const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits) { return SPARC_AES_CAPABLE ? &t4_aes_ccm : &aes_ccm; } diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c index b5c7e8472b..6e97b1f9d9 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.c +++ b/providers/implementations/ciphers/cipher_aes_gcm.c @@ -32,7 +32,7 @@ static void *aes_gcm_newctx(void *provctx, size_t keybits) ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) - gcm_initctx(provctx, &ctx->base, keybits, PROV_AES_HW_gcm(keybits), + gcm_initctx(provctx, &ctx->base, keybits, ossl_prov_aes_hw_gcm(keybits), AES_GCM_IV_MIN_SIZE); return ctx; } diff --git a/providers/implementations/ciphers/cipher_aes_gcm.h b/providers/implementations/ciphers/cipher_aes_gcm.h index d7006408de..2fe5e5499e 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.h +++ b/providers/implementations/ciphers/cipher_aes_gcm.h @@ -41,4 +41,4 @@ typedef struct prov_aes_gcm_ctx_st { } plat; } PROV_AES_GCM_CTX; -const PROV_GCM_HW *PROV_AES_HW_gcm(size_t keybits); +const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits); diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw.c b/providers/implementations/ciphers/cipher_aes_gcm_hw.c index c662887272..f29a280643 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw.c +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw.c @@ -142,7 +142,7 @@ static const PROV_GCM_HW aes_gcm = { #elif defined(AES_PMULL_CAPABLE) && defined(AES_GCM_ASM) # include "cipher_aes_gcm_hw_armv8.inc" #else -const PROV_GCM_HW *PROV_AES_HW_gcm(size_t keybits) +const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits) { return &aes_gcm; } diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc index 9e2504a343..c25bd617c2 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc @@ -31,7 +31,7 @@ static const PROV_GCM_HW aesni_gcm = { gcm_one_shot }; -const PROV_GCM_HW *PROV_AES_HW_gcm(size_t keybits) +const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits) { return AESNI_CAPABLE ? &aesni_gcm : &aes_gcm; } diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc index f44ada0faf..5c84bf31fd 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc @@ -77,7 +77,7 @@ static const PROV_GCM_HW armv8_aes_gcm = { gcm_one_shot }; -const PROV_GCM_HW *PROV_AES_HW_gcm(size_t keybits) +const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits) { return AES_PMULL_CAPABLE ? &armv8_aes_gcm : &aes_gcm; } diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_s390x.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_s390x.inc index e13771a449..256b9cb91c 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw_s390x.inc +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_s390x.inc @@ -290,7 +290,7 @@ static const PROV_GCM_HW s390x_aes_gcm = { s390x_aes_gcm_one_shot }; -const PROV_GCM_HW *PROV_AES_HW_gcm(size_t keybits) +const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits) { if ((keybits == 128 && S390X_aes_128_gcm_CAPABLE) || (keybits == 192 && S390X_aes_192_gcm_CAPABLE) diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_t4.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_t4.inc index 0a477128d3..1ad3ea465d 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm_hw_t4.inc +++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_t4.inc @@ -46,7 +46,7 @@ static const PROV_GCM_HW t4_aes_gcm = { gcm_cipher_final, gcm_one_shot }; -const PROV_GCM_ |