diff options
author | Pauli <paul.dale@oracle.com> | 2020-09-28 12:28:29 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-09-29 16:31:46 +1000 |
commit | 1be63951f87dfcbc98efe5d94a15298fea885890 (patch) | |
tree | 083ab242e6cf6521377635b5f0daacedfe937dbe /providers/implementations/ciphers | |
parent | 5e26c3399d154b9ed29558129ca1916a1b5b095e (diff) |
prov: prefix all OSSL_DISPATCH tables names with ossl_
This stops them leaking into other namespaces in a static build.
They remain internal.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13013)
Diffstat (limited to 'providers/implementations/ciphers')
28 files changed, 145 insertions, 144 deletions
diff --git a/providers/implementations/ciphers/cipher_aes.c b/providers/implementations/ciphers/cipher_aes.c index 4fa197024a..f2d75d7010 100644 --- a/providers/implementations/ciphers/cipher_aes.c +++ b/providers/implementations/ciphers/cipher_aes.c @@ -49,47 +49,47 @@ static void *aes_dupctx(void *ctx) return ret; } -/* aes256ecb_functions */ +/* ossl_aes256ecb_functions */ IMPLEMENT_generic_cipher(aes, AES, ecb, ECB, 0, 256, 128, 0, block) -/* aes192ecb_functions */ +/* ossl_aes192ecb_functions */ IMPLEMENT_generic_cipher(aes, AES, ecb, ECB, 0, 192, 128, 0, block) -/* aes128ecb_functions */ +/* ossl_aes128ecb_functions */ IMPLEMENT_generic_cipher(aes, AES, ecb, ECB, 0, 128, 128, 0, block) -/* aes256cbc_functions */ +/* ossl_aes256cbc_functions */ IMPLEMENT_generic_cipher(aes, AES, cbc, CBC, 0, 256, 128, 128, block) -/* aes192cbc_functions */ +/* ossl_aes192cbc_functions */ IMPLEMENT_generic_cipher(aes, AES, cbc, CBC, 0, 192, 128, 128, block) -/* aes128cbc_functions */ +/* ossl_aes128cbc_functions */ IMPLEMENT_generic_cipher(aes, AES, cbc, CBC, 0, 128, 128, 128, block) -/* aes256ofb_functions */ +/* ossl_aes256ofb_functions */ IMPLEMENT_generic_cipher(aes, AES, ofb, OFB, 0, 256, 8, 128, stream) -/* aes192ofb_functions */ +/* ossl_aes192ofb_functions */ IMPLEMENT_generic_cipher(aes, AES, ofb, OFB, 0, 192, 8, 128, stream) -/* aes128ofb_functions */ +/* ossl_aes128ofb_functions */ IMPLEMENT_generic_cipher(aes, AES, ofb, OFB, 0, 128, 8, 128, stream) -/* aes256cfb_functions */ +/* ossl_aes256cfb_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 256, 8, 128, stream) -/* aes192cfb_functions */ +/* ossl_aes192cfb_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 192, 8, 128, stream) -/* aes128cfb_functions */ +/* ossl_aes128cfb_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 128, 8, 128, stream) -/* aes256cfb1_functions */ +/* ossl_aes256cfb1_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb1, CFB, 0, 256, 8, 128, stream) -/* aes192cfb1_functions */ +/* ossl_aes192cfb1_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb1, CFB, 0, 192, 8, 128, stream) -/* aes128cfb1_functions */ +/* ossl_aes128cfb1_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb1, CFB, 0, 128, 8, 128, stream) -/* aes256cfb8_functions */ +/* ossl_aes256cfb8_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb8, CFB, 0, 256, 8, 128, stream) -/* aes192cfb8_functions */ +/* ossl_aes192cfb8_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb8, CFB, 0, 192, 8, 128, stream) -/* aes128cfb8_functions */ +/* ossl_aes128cfb8_functions */ IMPLEMENT_generic_cipher(aes, AES, cfb8, CFB, 0, 128, 8, 128, stream) -/* aes256ctr_functions */ +/* ossl_aes256ctr_functions */ IMPLEMENT_generic_cipher(aes, AES, ctr, CTR, 0, 256, 8, 128, stream) -/* aes192ctr_functions */ +/* ossl_aes192ctr_functions */ IMPLEMENT_generic_cipher(aes, AES, ctr, CTR, 0, 192, 8, 128, stream) -/* aes128ctr_functions */ +/* ossl_aes128ctr_functions */ IMPLEMENT_generic_cipher(aes, AES, ctr, CTR, 0, 128, 8, 128, stream) #include "cipher_aes_cts.inc" diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c index 6f5ecc12fb..1d499d9555 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c @@ -24,7 +24,7 @@ #ifndef AES_CBC_HMAC_SHA_CAPABLE # define IMPLEMENT_CIPHER(nm, sub, kbits, blkbits, ivbits, flags) \ -const OSSL_DISPATCH nm##kbits##sub##_functions[] = { \ +const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = { \ { 0, NULL } \ }; #else @@ -362,7 +362,7 @@ static int nm##_##kbits##_##sub##_get_params(OSSL_PARAM params[]) \ return cipher_generic_get_params(params, EVP_CIPH_CBC_MODE, \ flags, kbits, blkbits, ivbits); \ } \ -const OSSL_DISPATCH nm##kbits##sub##_functions[] = { \ +const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))nm##_##kbits##_##sub##_newctx },\ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))nm##_##sub##_freectx }, \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))nm##_einit }, \ @@ -387,11 +387,11 @@ const OSSL_DISPATCH nm##kbits##sub##_functions[] = { \ #endif /* AES_CBC_HMAC_SHA_CAPABLE */ -/* aes128cbc_hmac_sha1_functions */ +/* ossl_aes128cbc_hmac_sha1_functions */ IMPLEMENT_CIPHER(aes, cbc_hmac_sha1, 128, 128, 128, AES_CBC_HMAC_SHA_FLAGS) -/* aes256cbc_hmac_sha1_functions */ +/* ossl_aes256cbc_hmac_sha1_functions */ IMPLEMENT_CIPHER(aes, cbc_hmac_sha1, 256, 128, 128, AES_CBC_HMAC_SHA_FLAGS) -/* aes128cbc_hmac_sha256_functions */ +/* ossl_aes128cbc_hmac_sha256_functions */ IMPLEMENT_CIPHER(aes, cbc_hmac_sha256, 128, 128, 128, AES_CBC_HMAC_SHA_FLAGS) -/* aes256cbc_hmac_sha256_functions */ +/* ossl_aes256cbc_hmac_sha256_functions */ IMPLEMENT_CIPHER(aes, cbc_hmac_sha256, 256, 128, 128, AES_CBC_HMAC_SHA_FLAGS) diff --git a/providers/implementations/ciphers/cipher_aes_ccm.c b/providers/implementations/ciphers/cipher_aes_ccm.c index e45de7bca2..52bdd784d0 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm.c +++ b/providers/implementations/ciphers/cipher_aes_ccm.c @@ -41,9 +41,9 @@ static void aes_ccm_freectx(void *vctx) OPENSSL_clear_free(ctx, sizeof(*ctx)); } -/* aes128ccm_functions */ +/* ossl_aes128ccm_functions */ IMPLEMENT_aead_cipher(aes, ccm, CCM, AEAD_FLAGS, 128, 8, 96); -/* aes192ccm_functions */ +/* ossl_aes192ccm_functions */ IMPLEMENT_aead_cipher(aes, ccm, CCM, AEAD_FLAGS, 192, 8, 96); -/* aes256ccm_functions */ +/* ossl_aes256ccm_functions */ IMPLEMENT_aead_cipher(aes, ccm, CCM, AEAD_FLAGS, 256, 8, 96); diff --git a/providers/implementations/ciphers/cipher_aes_cts.inc b/providers/implementations/ciphers/cipher_aes_cts.inc index 5b33e972c5..5163f938c4 100644 --- a/providers/implementations/ciphers/cipher_aes_cts.inc +++ b/providers/implementations/ciphers/cipher_aes_cts.inc @@ -73,7 +73,7 @@ static int alg##_cts_##kbits##_##lcmode##_get_params(OSSL_PARAM params[]) \ return cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, flags, \ kbits, blkbits, ivbits); \ } \ -const OSSL_DISPATCH alg##kbits##lcmode##_cts_functions[] = { \ +const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_cts_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, \ (void (*)(void)) alg##_##kbits##_##lcmode##_newctx }, \ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx }, \ @@ -100,9 +100,9 @@ const OSSL_DISPATCH alg##kbits##lcmode##_cts_functions[] = { \ { 0, NULL } \ }; -/* aes256cbc_cts_functions */ +/* ossl_aes256cbc_cts_functions */ IMPLEMENT_cts_cipher(aes, AES, cbc, CBC, EVP_CIPH_FLAG_CTS, 256, 128, 128, block) -/* aes192cbc_cts_functions */ +/* ossl_aes192cbc_cts_functions */ IMPLEMENT_cts_cipher(aes, AES, cbc, CBC, EVP_CIPH_FLAG_CTS, 192, 128, 128, block) -/* aes128cbc_cts_functions */ +/* ossl_aes128cbc_cts_functions */ IMPLEMENT_cts_cipher(aes, AES, cbc, CBC, EVP_CIPH_FLAG_CTS, 128, 128, 128, block) diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c index 409dfa7b33..b5c7e8472b 100644 --- a/providers/implementations/ciphers/cipher_aes_gcm.c +++ b/providers/implementations/ciphers/cipher_aes_gcm.c @@ -45,9 +45,9 @@ static void aes_gcm_freectx(void *vctx) OPENSSL_clear_free(ctx, sizeof(*ctx)); } -/* aes128gcm_functions */ +/* ossl_aes128gcm_functions */ IMPLEMENT_aead_cipher(aes, gcm, GCM, AEAD_FLAGS, 128, 8, 96); -/* aes192gcm_functions */ +/* ossl_aes192gcm_functions */ IMPLEMENT_aead_cipher(aes, gcm, GCM, AEAD_FLAGS, 192, 8, 96); -/* aes256gcm_functions */ +/* ossl_aes256gcm_functions */ IMPLEMENT_aead_cipher(aes, gcm, GCM, AEAD_FLAGS, 256, 8, 96); diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 27edd455ed..3728711828 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -518,7 +518,7 @@ static void *aes_##kbits##_##mode##_newctx(void *provctx) \ return aes_##mode##_newctx(provctx, kbits, blkbits, ivbits, \ EVP_CIPH_##UCMODE##_MODE, flags); \ } \ -const OSSL_DISPATCH aes##kbits##mode##_functions[] = { \ +const OSSL_DISPATCH ossl_##aes##kbits##mode##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, \ (void (*)(void))aes_##kbits##_##mode##_newctx }, \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit }, \ diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c index 6894567fb2..cac71eea9a 100644 --- a/providers/implementations/ciphers/cipher_aes_siv.c +++ b/providers/implementations/ciphers/cipher_aes_siv.c @@ -266,7 +266,7 @@ static void * alg##kbits##lc##_newctx(void *provctx) \ return alg##_##lc##_newctx(provctx, 2*kbits, EVP_CIPH_##UCMODE##_MODE, \ flags); \ } \ -const OSSL_DISPATCH alg##kbits##lc##_functions[] = { \ +const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx }, \ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx }, \ { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) lc##_dupctx }, \ diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c index df10a65a87..50c56eba1f 100644 --- a/providers/implementations/ciphers/cipher_aes_wrp.c +++ b/providers/implementations/ciphers/cipher_aes_wrp.c @@ -237,7 +237,7 @@ static int aes_wrap_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return aes_##mode##_newctx(kbits, blkbits, ivbits, \ EVP_CIPH_##UCMODE##_MODE, flags); \ } \ - const OSSL_DISPATCH aes##kbits##fname##_functions[] = { \ + const OSSL_DISPATCH ossl_##aes##kbits##fname##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, \ (void (*)(void))aes_##kbits##fname##_newctx }, \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit }, \ diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index 72ed2334b1..e28008b773 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/providers/implementations/ciphers/cipher_aes_xts.c @@ -1,3 +1,4 @@ + /* * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved. * @@ -265,7 +266,7 @@ static void *aes_##kbits##_xts_newctx(void *provctx) \ return aes_xts_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, flags, 2 * kbits, \ AES_XTS_BLOCK_BITS, AES_XTS_IV_BITS); \ } \ -const OSSL_DISPATCH aes##kbits##xts_functions[] = { \ +const OSSL_DISPATCH ossl_aes##kbits##xts_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##kbits##_xts_newctx }, \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_xts_einit }, \ { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_xts_dinit }, \ diff --git a/providers/implementations/ciphers/cipher_aria.c b/providers/implementations/ciphers/cipher_aria.c index 9f4c8dda7b..a85162fad5 100644 --- a/providers/implementations/ciphers/cipher_aria.c +++ b/providers/implementations/ciphers/cipher_aria.c @@ -42,45 +42,45 @@ static void *aria_dupctx(void *ctx) return ret; } -/* aria256ecb_functions */ +/* ossl_aria256ecb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ecb, ECB, 0, 256, 128, 0, block) -/* aria192ecb_functions */ +/* ossl_aria192ecb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ecb, ECB, 0, 192, 128, 0, block) -/* aria128ecb_functions */ +/* ossl_aria128ecb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ecb, ECB, 0, 128, 128, 0, block) -/* aria256cbc_functions */ +/* ossl_aria256cbc_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cbc, CBC, 0, 256, 128, 128, block) -/* aria192cbc_functions */ +/* ossl_aria192cbc_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cbc, CBC, 0, 192, 128, 128, block) -/* aria128cbc_functions */ +/* ossl_aria128cbc_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cbc, CBC, 0, 128, 128, 128, block) -/* aria256ofb_functions */ +/* ossl_aria256ofb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ofb, OFB, 0, 256, 8, 128, stream) -/* aria192ofb_functions */ +/* ossl_aria192ofb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ofb, OFB, 0, 192, 8, 128, stream) -/* aria128ofb_functions */ +/* ossl_aria128ofb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ofb, OFB, 0, 128, 8, 128, stream) -/* aria256cfb_functions */ +/* ossl_aria256cfb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 256, 8, 128, stream) -/* aria192cfb_functions */ +/* ossl_aria192cfb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 192, 8, 128, stream) -/* aria128cfb_functions */ +/* ossl_aria128cfb_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 128, 8, 128, stream) -/* aria256cfb1_functions */ +/* ossl_aria256cfb1_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb1, CFB, 0, 256, 8, 128, stream) -/* aria192cfb1_functions */ +/* ossl_aria192cfb1_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb1, CFB, 0, 192, 8, 128, stream) -/* aria128cfb1_functions */ +/* ossl_aria128cfb1_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb1, CFB, 0, 128, 8, 128, stream) -/* aria256cfb8_functions */ +/* ossl_aria256cfb8_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb8, CFB, 0, 256, 8, 128, stream) -/* aria192cfb8_functions */ +/* ossl_aria192cfb8_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb8, CFB, 0, 192, 8, 128, stream) -/* aria128cfb8_functions */ +/* ossl_aria128cfb8_functions */ IMPLEMENT_generic_cipher(aria, ARIA, cfb8, CFB, 0, 128, 8, 128, stream) -/* aria256ctr_functions */ +/* ossl_aria256ctr_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ctr, CTR, 0, 256, 8, 128, stream) -/* aria192ctr_functions */ +/* ossl_aria192ctr_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ctr, CTR, 0, 192, 8, 128, stream) -/* aria128ctr_functions */ +/* ossl_aria128ctr_functions */ IMPLEMENT_generic_cipher(aria, ARIA, ctr, CTR, 0, 128, 8, 128, stream) diff --git a/providers/implementations/ciphers/cipher_aria_gcm.c b/providers/implementations/ciphers/cipher_aria_gcm.c index a54afae1bb..4e934febac 100644 --- a/providers/implementations/ciphers/cipher_aria_gcm.c +++ b/providers/implementations/ciphers/cipher_aria_gcm.c @@ -37,10 +37,10 @@ static void aria_gcm_freectx(void *vctx) OPENSSL_clear_free(ctx, sizeof(*ctx)); } -/* aria128gcm_functions */ +/* ossl_aria128gcm_functions */ IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 128, 8, 96); -/* aria192gcm_functions */ +/* ossl_aria192gcm_functions */ IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 192, 8, 96); -/* aria256gcm_functions */ +/* ossl_aria256gcm_functions */ IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 256, 8, 96); diff --git a/providers/implementations/ciphers/cipher_camellia.c b/providers/implementations/ciphers/cipher_camellia.c index 84d5aaaa89..90cb1c18be 100644 --- a/providers/implementations/ciphers/cipher_camellia.c +++ b/providers/implementations/ciphers/cipher_camellia.c @@ -48,46 +48,46 @@ static void *camellia_dupctx(void *ctx) return ret; } -/* camellia256ecb_functions */ +/* ossl_camellia256ecb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ecb, ECB, 0, 256, 128, 0, block) -/* camellia192ecb_functions */ +/* ossl_camellia192ecb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ecb, ECB, 0, 192, 128, 0, block) -/* camellia128ecb_functions */ +/* ossl_camellia128ecb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ecb, ECB, 0, 128, 128, 0, block) -/* camellia256cbc_functions */ +/* ossl_camellia256cbc_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cbc, CBC, 0, 256, 128, 128, block) -/* camellia192cbc_functions */ +/* ossl_camellia192cbc_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cbc, CBC, 0, 192, 128, 128, block) -/* camellia128cbc_functions */ +/* ossl_camellia128cbc_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cbc, CBC, 0, 128, 128, 128, block) -/* camellia256ofb_functions */ +/* ossl_camellia256ofb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ofb, OFB, 0, 256, 8, 128, stream) -/* camellia192ofb_functions */ +/* ossl_camellia192ofb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ofb, OFB, 0, 192, 8, 128, stream) -/* camellia128ofb_functions */ +/* ossl_camellia128ofb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ofb, OFB, 0, 128, 8, 128, stream) -/* camellia256cfb_functions */ +/* ossl_camellia256cfb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 256, 8, 128, stream) -/* camellia192cfb_functions */ +/* ossl_camellia192cfb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 192, 8, 128, stream) -/* camellia128cfb_functions */ +/* ossl_camellia128cfb_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 128, 8, 128, stream) -/* camellia256cfb1_functions */ +/* ossl_camellia256cfb1_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb1, CFB, 0, 256, 8, 128, stream) -/* camellia192cfb1_functions */ +/* ossl_camellia192cfb1_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb1, CFB, 0, 192, 8, 128, stream) -/* camellia128cfb1_functions */ +/* ossl_camellia128cfb1_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb1, CFB, 0, 128, 8, 128, stream) -/* camellia256cfb8_functions */ +/* ossl_camellia256cfb8_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb8, CFB, 0, 256, 8, 128, stream) -/* camellia192cfb8_functions */ +/* ossl_camellia192cfb8_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb8, CFB, 0, 192, 8, 128, stream) -/* camellia128cfb8_functions */ +/* ossl_camellia128cfb8_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb8, CFB, 0, 128, 8, 128, stream) -/* camellia256ctr_functions */ +/* ossl_camellia256ctr_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ctr, CTR, 0, 256, 8, 128, stream) -/* camellia192ctr_functions */ +/* ossl_camellia192ctr_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ctr, CTR, 0, 192, 8, 128, stream) -/* camellia128ctr_functions */ +/* ossl_camellia128ctr_functions */ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ctr, CTR, 0, 128, 8, 128, stream) diff --git a/providers/implementations/ciphers/cipher_cast5.c b/providers/implementations/ciphers/cipher_cast5.c index bc3088f81b..1551f690ad 100644 --- a/providers/implementations/ciphers/cipher_cast5.c +++ b/providers/implementations/ciphers/cipher_cast5.c @@ -51,11 +51,11 @@ static void *cast5_dupctx(void *ctx) return ret; } -/* cast5128ecb_functions */ +/* ossl_cast5128ecb_functions */ IMPLEMENT_var_keylen_cipher(cast5, CAST, ecb, ECB, CAST5_FLAGS, 128, 64, 0, block) -/* cast5128cbc_functions */ +/* ossl_cast5128cbc_functions */ IMPLEMENT_var_keylen_cipher(cast5, CAST, cbc, CBC, CAST5_FLAGS, 128, 64, 64, block) -/* cast5128ofb64_functions */ +/* ossl_cast5128ofb64_functions */ IMPLEMENT_var_keylen_cipher(cast5, CAST, ofb64, OFB, CAST5_FLAGS, 128, 8, 64, stream) -/* cast5128cfb64_functions */ +/* ossl_cast5128cfb64_functions */ IMPLEMENT_var_keylen_cipher(cast5, CAST, cfb64, CFB, CAST5_FLAGS, 128, 8, 64, stream) diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c index 56bc1b95af..1f44601c61 100644 --- a/providers/implementations/ciphers/cipher_chacha20.c +++ b/providers/implementations/ciphers/cipher_chacha20.c @@ -173,8 +173,8 @@ int chacha20_dinit(void *vctx, const unsigned char *key, size_t keylen, return ret; } -/* chacha20_functions */ -const OSSL_DISPATCH chacha20_functions[] = { +/* ossl_chacha20_functions */ +const OSSL_DISPATCH ossl_chacha20_functions[] = { { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))chacha20_newctx }, { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))chacha20_freectx }, { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))chacha20_einit }, diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c index da47e34fdf..e2aa691378 100644 --- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c +++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c @@ -308,8 +308,8 @@ static int chacha20_poly1305_final(void *vctx, unsigned char *out, size_t *outl, return 1; } -/* chacha20_poly1305_functions */ -const OSSL_DISPATCH chacha20_poly1305_functions[] = { +/* ossl_chacha20_ossl_poly1305_functions */ +const OSSL_DISPATCH ossl_chacha20_ossl_poly1305_functions[] = { { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))chacha20_poly1305_newctx }, { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))chacha20_poly1305_freectx }, { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))chacha20_poly1305_einit }, diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c index 269125c63d..7b6f2d7da5 100644 --- a/providers/implementations/ciphers/cipher_des.c +++ b/providers/implementations/ciphers/cipher_des.c @@ -157,7 +157,7 @@ static int des_##lcmode##_get_params(OSSL_PARAM params[]) \ return cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, flags, \ kbits, blkbits, ivbits); \ } \ -const OSSL_DISPATCH des_##lcmode##_functions[] = { \ +const OSSL_DISPATCH ossl_##des_##lcmode##_functions[] = { \ { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))des_einit }, \ { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))des_dinit }, \ { OSSL_FUNC_CIPHER_UPDATE, \ @@ -182,15 +182,15 @@ const OSSL_DISPATCH des_##lcmode##_functions[] = { \ { 0, NULL } \ } -/* des_ecb_functions */ +/* ossl_des_ecb_functions */ IMPLEMENT_des_cipher(des, ecb, ECB, DES_FLAGS, 64, 64, 0, block); -/* des_cbc_functions */ +/* ossl_des_cbc_functions */ IMPLEMENT_des_cipher(des, cbc, CBC, DES_FLAGS, 64, 64, 64, block); -/* des_ofb64_functions */ +/* ossl_des_ofb64_functions */ IMPLEMENT_des_cipher(des, ofb64, OFB, DES_FLAGS, 64, 8, 64, stream); -/* des_cfb64_functions */ +/* ossl_des_cfb64_functions */ IMPLEMENT_des_cipher(des, cfb64, CFB, DES_FLAGS, 64, 8, 64, stream); -/* des_cfb1_functions */ +/* ossl_des_cfb1_functions */ IMPLEMENT_des_cipher(des, cfb1, CFB, DES_FLAGS, 64, 8, 64, stream); -/* des_cfb8_functions */ +/* ossl_des_cfb8_functions */ IMPLEMENT_des_cipher(des, cfb8, CFB, DES_FLAGS, 64, 8, 64, stream); diff --git a/providers/implementations/ciphers/cipher_idea.c b/providers/implementations/ciphers/cipher_idea.c index 07a6d4b997..624c8cb8fc 100644 --- a/providers/implementations/ciphers/cipher_idea.c +++ b/providers/implementations/ciphers/cipher_idea.c @@ -49,11 +49,11 @@ static void *idea_dupctx(void *ctx) return ret; } -/* idea128ecb_functions */ +/* ossl_idea128ecb_functions */ IMPLEMENT_generic_cipher(idea, IDEA, ecb, ECB, 0, 128, 64, 0, block) -/* idea128cbc_functions */ +/* ossl_idea128cbc_functions */ IMPLEMENT_generic_cipher(idea, IDEA, cbc, CBC, 0, 128, 64, 64, block) -/* idea128ofb64_functions */ +/* ossl_idea128ofb64_functions */ IMPLEMENT_generic_cipher(idea, IDEA, ofb64, OFB, 0, 128, 8, 64, stream) -/* idea128cfb64_functions */ +/* ossl_idea128cfb64_functions */ IMPLEMENT_generic_cipher(idea, IDEA, cfb64, CFB, 0, 128, 8, 64, stream) diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c index c29fdd4b32..ce8edcf785 100644 --- a/providers/implementations/ciphers/cipher_null.c +++ b/providers/implementations/ciphers/cipher_null.c @@ -170,7 +170,7 @@ static int null_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 1; } -const OSSL_DISPATCH null_functions[] = { +const OSSL_DISPATCH ossl_null_functions[] = { { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void)) null_newctx }, { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) null_freectx }, diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c index 85151718ee..022f4c66a3 100644 --- a/providers/implementations/ciphers/cipher_rc2.c +++ b/providers/implementations/ciphers/cipher_rc2.c @@ -215,7 +215,7 @@ static void * alg##_##kbits##_##lcmode##_newctx(void *provctx) \ } \ return ctx; \ } \ -const OSSL_DISPATCH alg##kbits##lcmode##_functions[] = { \ +const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = { \ { OSSL_FUNC_CIPHER_NEWCTX, \ (void (*)(void)) alg##_##kbits##_##lcmode##_newctx }, \ { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx }, \ @@ -240,16 +240,16 @@ const OSSL_DISPATCH alg##kbits##lcmode##_functions[] = { \ { 0, NULL } \ }; -/* rc2128ecb_functions */ +/* ossl_rc2128ecb_functions */ IMPLEMENT_cipher(rc2, RC2, ecb, ECB, EVP_CIPH_VARIABLE_LENGTH, 128, 64, 0, block) -/* rc2128cbc_functions */ +/* ossl_rc2128cbc_functions */ IMPLEMENT_cipher(rc2, RC2, cbc, CBC, EVP_CIPH_VARIABLE_LENGTH, 128, 64, 64, block) -/* rc240cbc_functions */ +/* ossl_rc240cbc_functions */ IMPLEMENT_cipher(rc2, RC2, cbc, CBC, EVP_CIPH_VARIABLE_LENGTH, 40, 64, 64, block) -/* rc264cbc_functions */ +/* ossl_rc264cbc_functions */ IMPLEMENT_cipher(rc2, RC2, cbc, CBC, EVP_CIPH_VARIABLE_LENGTH, 64, 64, 64, block) -/* rc2128ofb128_functions */ +/* ossl_rc2128ofb128_functions */ IMPLEMENT_cipher(rc2, RC2, ofb128, OFB, EVP_CIPH_VARIABLE_LENGTH, 128, 8, 64, stream) -/* rc2128cfb128_functions */ +/* ossl_rc2128cfb128_functions */ IMPLEMENT_cipher(rc2, RC2, cfb128, CFB, EVP_CIPH_VARIABLE_LENGTH, 128, 8, 64, stream) diff --git a/providers/implementations/ciphers/cipher_rc4.c b/providers/implementations/ciphers/cipher_rc4.c index 02fff58acd..f9086fbfc5 100644 --- a/providers/implementations/ciphers/cipher_rc4.c +++ b/providers/implementations/ciphers/cipher_rc4.c @@ -71,7 +71,7 @@ static void * alg##_##kbits##_newctx(void *provctx) \ |