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/digests | |
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/digests')
-rw-r--r-- | providers/implementations/digests/blake2_prov.c | 4 | ||||
-rw-r--r-- | providers/implementations/digests/md2_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/md4_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/md5_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/md5_sha1_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/mdc2_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/ripemd_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/sha2_prov.c | 14 | ||||
-rw-r--r-- | providers/implementations/digests/sha3_prov.c | 18 | ||||
-rw-r--r-- | providers/implementations/digests/sm3_prov.c | 2 | ||||
-rw-r--r-- | providers/implementations/digests/wp_prov.c | 2 |
11 files changed, 26 insertions, 26 deletions
diff --git a/providers/implementations/digests/blake2_prov.c b/providers/implementations/digests/blake2_prov.c index cd13fd2adf..8bb1050f43 100644 --- a/providers/implementations/digests/blake2_prov.c +++ b/providers/implementations/digests/blake2_prov.c @@ -31,12 +31,12 @@ int blake2b512_init(void *ctx) return blake2b_init((BLAKE2B_CTX *)ctx, &P); } -/* blake2s256_functions */ +/* ossl_blake2s256_functions */ IMPLEMENT_digest_functions(blake2s256, BLAKE2S_CTX, BLAKE2S_BLOCKBYTES, BLAKE2S_DIGEST_LENGTH, 0, blake2s256_init, blake2s_update, blake2s_final) -/* blake2b512_functions */ +/* ossl_blake2b512_functions */ IMPLEMENT_digest_functions(blake2b512, BLAKE2B_CTX, BLAKE2B_BLOCKBYTES, BLAKE2B_DIGEST_LENGTH, 0, blake2b512_init, blake2b_update, blake2b_final) diff --git a/providers/implementations/digests/md2_prov.c b/providers/implementations/digests/md2_prov.c index 481dcf6f48..a41a02c198 100644 --- a/providers/implementations/digests/md2_prov.c +++ b/providers/implementations/digests/md2_prov.c @@ -18,7 +18,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* md2_functions */ +/* ossl_md2_functions */ IMPLEMENT_digest_functions(md2, MD2_CTX, MD2_BLOCK, MD2_DIGEST_LENGTH, 0, MD2_Init, MD2_Update, MD2_Final) diff --git a/providers/implementations/digests/md4_prov.c b/providers/implementations/digests/md4_prov.c index 9668c68a71..97f73018c2 100644 --- a/providers/implementations/digests/md4_prov.c +++ b/providers/implementations/digests/md4_prov.c @@ -18,7 +18,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* md4_functions */ +/* ossl_md4_functions */ IMPLEMENT_digest_functions(md4, MD4_CTX, MD4_CBLOCK, MD4_DIGEST_LENGTH, 0, MD4_Init, MD4_Update, MD4_Final) diff --git a/providers/implementations/digests/md5_prov.c b/providers/implementations/digests/md5_prov.c index 0090c4f967..a330e057f5 100644 --- a/providers/implementations/digests/md5_prov.c +++ b/providers/implementations/digests/md5_prov.c @@ -18,7 +18,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* md5_functions */ +/* ossl_md5_functions */ IMPLEMENT_digest_functions(md5, MD5_CTX, MD5_CBLOCK, MD5_DIGEST_LENGTH, 0, MD5_Init, MD5_Update, MD5_Final) diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c index a65cbbd55c..7c127d74a6 100644 --- a/providers/implementations/digests/md5_sha1_prov.c +++ b/providers/implementations/digests/md5_sha1_prov.c @@ -50,7 +50,7 @@ static int md5_sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 0; } -/* md5_sha1_functions */ +/* ossl_md5_sha1_functions */ IMPLEMENT_digest_functions_with_settable_ctx( md5_sha1, MD5_SHA1_CTX, MD5_SHA1_CBLOCK, MD5_SHA1_DIGEST_LENGTH, 0, md5_sha1_init, md5_sha1_update, md5_sha1_final, diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c index 613be655bc..b184c8393c 100644 --- a/providers/implementations/digests/mdc2_prov.c +++ b/providers/implementations/digests/mdc2_prov.c @@ -51,7 +51,7 @@ static int mdc2_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 0; /* Null Parameter */ } -/* mdc2_functions */ +/* ossl_mdc2_functions */ IMPLEMENT_digest_functions_with_settable_ctx( mdc2, MDC2_CTX, MDC2_BLOCK, MDC2_DIGEST_LENGTH, 0, MDC2_Init, MDC2_Update, MDC2_Final, diff --git a/providers/implementations/digests/ripemd_prov.c b/providers/implementations/digests/ripemd_prov.c index 70be9a9efc..526706c06d 100644 --- a/providers/implementations/digests/ripemd_prov.c +++ b/providers/implementations/digests/ripemd_prov.c @@ -18,7 +18,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* ripemd160_functions */ +/* ossl_ripemd160_functions */ IMPLEMENT_digest_functions(ripemd160, RIPEMD160_CTX, RIPEMD160_CBLOCK, RIPEMD160_DIGEST_LENGTH, 0, RIPEMD160_Init, RIPEMD160_Update, RIPEMD160_Final) diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c index fe2f82dc48..dec9c316e7 100644 --- a/providers/implementations/digests/sha2_prov.c +++ b/providers/implementations/digests/sha2_prov.c @@ -51,43 +51,43 @@ static int sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[]) return 0; } -/* sha1_functions */ +/* ossl_sha1_functions */ IMPLEMENT_digest_functions_with_settable_ctx( sha1, SHA_CTX, SHA_CBLOCK, SHA_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, SHA1_Init, SHA1_Update, SHA1_Final, sha1_settable_ctx_params, sha1_set_ctx_params) -/* sha224_functions */ +/* ossl_sha224_functions */ IMPLEMENT_digest_functions(sha224, SHA256_CTX, SHA256_CBLOCK, SHA224_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, SHA224_Init, SHA224_Update, SHA224_Final) -/* sha256_functions */ +/* ossl_sha256_functions */ IMPLEMENT_digest_functions(sha256, SHA256_CTX, SHA256_CBLOCK, SHA256_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, SHA256_Init, SHA256_Update, SHA256_Final) -/* sha384_functions */ +/* ossl_sha384_functions */ IMPLEMENT_digest_functions(sha384, SHA512_CTX, SHA512_CBLOCK, SHA384_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, SHA384_Init, SHA384_Update, SHA384_Final) -/* sha512_functions */ +/* ossl_sha512_functions */ IMPLEMENT_digest_functions(sha512, SHA512_CTX, SHA512_CBLOCK, SHA512_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, SHA512_Init, SHA512_Update, SHA512_Final) -/* sha512_224_functions */ +/* ossl_sha512_224_functions */ IMPLEMENT_digest_functions(sha512_224, SHA512_CTX, SHA512_CBLOCK, SHA224_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, sha512_224_init, SHA512_Update, SHA512_Final) -/* sha512_256_functions */ +/* ossl_sha512_256_functions */ IMPLEMENT_digest_functions(sha512_256, SHA512_CTX, SHA512_CBLOCK, SHA256_DIGEST_LENGTH, EVP_MD_FLAG_DIGALGID_ABSENT, diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 4c22448940..38e2beb1e7 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -219,7 +219,7 @@ static void *uname##_newctx(void *provctx) \ #define PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags) \ PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags) \ -const OSSL_DISPATCH name##_functions[] = { \ +const OSSL_DISPATCH ossl_##name##_functions[] = { \ { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))name##_newctx }, \ { OSSL_FUNC_DIGEST_INIT, (void (*)(void))keccak_init }, \ { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))keccak_update }, \ @@ -299,19 +299,19 @@ static int shake_set_ctx_params(void *vctx, const OSSL_PARAM params[]) SHA3_BLOCKSIZE(bitlen), KMAC_MDSIZE(bitlen), \ EVP_MD_FLAG_XOF) -/* sha3_224_functions */ +/* ossl_sha3_224_functions */ IMPLEMENT_SHA3_functions(224) -/* sha3_256_functions */ +/* ossl_sha3_256_functions */ IMPLEMENT_SHA3_functions(256) -/* sha3_384_functions */ +/* ossl_sha3_384_functions */ IMPLEMENT_SHA3_functions(384) -/* sha3_512_functions */ +/* ossl_sha3_512_functions */ IMPLEMENT_SHA3_functions(512) -/* shake_128_functions */ +/* ossl_shake_128_functions */ IMPLEMENT_SHAKE_functions(128) -/* shake_256_functions */ +/* ossl_shake_256_functions */ IMPLEMENT_SHAKE_functions(256) -/* keccak_kmac_128_functions */ +/* ossl_keccak_kmac_128_functions */ IMPLEMENT_KMAC_functions(128) -/* keccak_kmac_256_functions */ +/* ossl_keccak_kmac_256_functions */ IMPLEMENT_KMAC_functions(256) diff --git a/providers/implementations/digests/sm3_prov.c b/providers/implementations/digests/sm3_prov.c index 88e65d1537..aa586cb1f5 100644 --- a/providers/implementations/digests/sm3_prov.c +++ b/providers/implementations/digests/sm3_prov.c @@ -12,7 +12,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* sm3_functions */ +/* ossl_sm3_functions */ IMPLEMENT_digest_functions(sm3, SM3_CTX, SM3_CBLOCK, SM3_DIGEST_LENGTH, 0, sm3_init, sm3_update, sm3_final) diff --git a/providers/implementations/digests/wp_prov.c b/providers/implementations/digests/wp_prov.c index d0e2d20b1d..2af70b3372 100644 --- a/providers/implementations/digests/wp_prov.c +++ b/providers/implementations/digests/wp_prov.c @@ -18,7 +18,7 @@ #include "prov/digestcommon.h" #include "prov/implementations.h" -/* wp_functions */ +/* ossl_wp_functions */ IMPLEMENT_digest_functions(wp, WHIRLPOOL_CTX, WHIRLPOOL_BBLOCK / 8, WHIRLPOOL_DIGEST_LENGTH, 0, WHIRLPOOL_Init, WHIRLPOOL_Update, WHIRLPOOL_Final) |