summaryrefslogtreecommitdiffstats
path: root/providers
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-09-28 12:28:29 +1000
committerPauli <paul.dale@oracle.com>2020-09-29 16:31:46 +1000
commit1be63951f87dfcbc98efe5d94a15298fea885890 (patch)
tree083ab242e6cf6521377635b5f0daacedfe937dbe /providers
parent5e26c3399d154b9ed29558129ca1916a1b5b095e (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')
-rw-r--r--providers/decoders.inc30
-rw-r--r--providers/defltprov.c394
-rw-r--r--providers/encoders.inc60
-rw-r--r--providers/fips/fipsprov.c221
-rw-r--r--providers/implementations/asymciphers/rsa_enc.c2
-rw-r--r--providers/implementations/ciphers/cipher_aes.c42
-rw-r--r--providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c12
-rw-r--r--providers/implementations/ciphers/cipher_aes_ccm.c6
-rw-r--r--providers/implementations/ciphers/cipher_aes_cts.inc8
-rw-r--r--providers/implementations/ciphers/cipher_aes_gcm.c6
-rw-r--r--providers/implementations/ciphers/cipher_aes_ocb.c2
-rw-r--r--providers/implementations/ciphers/cipher_aes_siv.c2
-rw-r--r--providers/implementations/ciphers/cipher_aes_wrp.c2
-rw-r--r--providers/implementations/ciphers/cipher_aes_xts.c3
-rw-r--r--providers/implementations/ciphers/cipher_aria.c42
-rw-r--r--providers/implementations/ciphers/cipher_aria_gcm.c6
-rw-r--r--providers/implementations/ciphers/cipher_camellia.c42
-rw-r--r--providers/implementations/ciphers/cipher_cast5.c8
-rw-r--r--providers/implementations/ciphers/cipher_chacha20.c4
-rw-r--r--providers/implementations/ciphers/cipher_chacha20_poly1305.c4
-rw-r--r--providers/implementations/ciphers/cipher_des.c14
-rw-r--r--providers/implementations/ciphers/cipher_idea.c8
-rw-r--r--providers/implementations/ciphers/cipher_null.c2
-rw-r--r--providers/implementations/ciphers/cipher_rc2.c14
-rw-r--r--providers/implementations/ciphers/cipher_rc4.c6
-rw-r--r--providers/implementations/ciphers/cipher_rc4_hmac_md5.c2
-rw-r--r--providers/implementations/ciphers/cipher_rc5.c10
-rw-r--r--providers/implementations/ciphers/cipher_seed.c8
-rw-r--r--providers/implementations/ciphers/cipher_sm4.c10
-rw-r--r--providers/implementations/ciphers/cipher_tdes.c4
-rw-r--r--providers/implementations/ciphers/cipher_tdes.h2
-rw-r--r--providers/implementations/ciphers/cipher_tdes_default.c16
-rw-r--r--providers/implementations/ciphers/cipher_tdes_wrap.c4
-rw-r--r--providers/implementations/digests/blake2_prov.c4
-rw-r--r--providers/implementations/digests/md2_prov.c2
-rw-r--r--providers/implementations/digests/md4_prov.c2
-rw-r--r--providers/implementations/digests/md5_prov.c2
-rw-r--r--providers/implementations/digests/md5_sha1_prov.c2
-rw-r--r--providers/implementations/digests/mdc2_prov.c2
-rw-r--r--providers/implementations/digests/ripemd_prov.c2
-rw-r--r--providers/implementations/digests/sha2_prov.c14
-rw-r--r--providers/implementations/digests/sha3_prov.c18
-rw-r--r--providers/implementations/digests/sm3_prov.c2
-rw-r--r--providers/implementations/digests/wp_prov.c2
-rw-r--r--providers/implementations/encode_decode/decode_der2key.c5
-rw-r--r--providers/implementations/encode_decode/decode_ms2key.c5
-rw-r--r--providers/implementations/encode_decode/decode_pem2der.c2
-rw-r--r--providers/implementations/encode_decode/encode_key2any.c6
-rw-r--r--providers/implementations/encode_decode/encode_key2text.c8
-rw-r--r--providers/implementations/exchange/dh_exch.c2
-rw-r--r--providers/implementations/exchange/ecdh_exch.c2
-rw-r--r--providers/implementations/exchange/ecx_exch.c4
-rw-r--r--providers/implementations/exchange/kdf_exch.c2
-rw-r--r--providers/implementations/include/prov/ciphercommon.h4
-rw-r--r--providers/implementations/include/prov/ciphercommon_aead.h2
-rw-r--r--providers/implementations/include/prov/digestcommon.h2
-rw-r--r--providers/implementations/include/prov/implementations.h554
-rw-r--r--providers/implementations/kdfs/hkdf.c2
-rw-r--r--providers/implementations/kdfs/kbkdf.c2
-rw-r--r--providers/implementations/kdfs/krb5kdf.c2
-rw-r--r--providers/implementations/kdfs/pbkdf2.c2
-rw-r--r--providers/implementations/kdfs/pkcs12kdf.c2
-rw-r--r--providers/implementations/kdfs/scrypt.c2
-rw-r--r--providers/implementations/kdfs/sshkdf.c2
-rw-r--r--providers/implementations/kdfs/sskdf.c4
-rw-r--r--providers/implementations/kdfs/tls1_prf.c2
-rw-r--r--providers/implementations/kdfs/x942kdf.c2
-rw-r--r--providers/implementations/kem/rsa_kem.c2
-rw-r--r--providers/implementations/keymgmt/dh_kmgmt.c4
-rw-r--r--providers/implementations/keymgmt/dsa_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/ec_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/ecx_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/kdf_legacy_kmgmt.c2
-rw-r--r--providers/implementations/keymgmt/mac_legacy_kmgmt.c4
-rw-r--r--providers/implementations/keymgmt/rsa_kmgmt.c4
-rw-r--r--providers/implementations/macs/blake2b_mac.c2
-rw-r--r--providers/implementations/macs/blake2s_mac.c2
-rw-r--r--providers/implementations/macs/cmac_prov.c2
-rw-r--r--providers/implementations/macs/gmac_prov.c2
-rw-r--r--providers/implementations/macs/hmac_prov.c2
-rw-r--r--providers/implementations/macs/kmac_prov.c4
-rw-r--r--providers/implementations/macs/poly1305_prov.c2
-rw-r--r--providers/implementations/macs/siphash_prov.c2
-rw-r--r--providers/implementations/rands/drbg_ctr.c2
-rw-r--r--providers/implementations/rands/drbg_hash.c2
-rw-r--r--providers/implementations/rands/drbg_hmac.c2
-rw-r--r--providers/implementations/rands/test_rng.c2
-rw-r--r--providers/implementations/signature/dsa.c2
-rw-r--r--providers/implementations/signature/ecdsa.c2
-rw-r--r--providers/implementations/signature/eddsa.c4
-rw-r--r--providers/implementations/signature/mac_legacy.c2
-rw-r--r--providers/implementations/signature/rsa.c2
-rw-r--r--providers/implementations/storemgmt/file_store.c2
-rw-r--r--providers/legacyprov.c82
-rw-r--r--providers/stores.inc2
95 files changed, 918 insertions, 896 deletions
diff --git a/providers/decoders.inc b/providers/decoders.inc
index d8c6da72e1..4f5699418b 100644
--- a/providers/decoders.inc
+++ b/providers/decoders.inc
@@ -12,31 +12,31 @@
#endif
#ifndef OPENSSL_NO_DH
- DECODER("DH", "yes", "der", der_to_dh_decoder_functions),
- DECODER("DHX", "yes", "der", der_to_dhx_decoder_functions),
+ DECODER("DH", "yes", "der", ossl_der_to_dh_decoder_functions),
+ DECODER("DHX", "yes", "der", ossl_der_to_dhx_decoder_functions),
#endif
#ifndef OPENSSL_NO_DSA
- DECODER("DSA", "yes", "der", der_to_dsa_decoder_functions),
- DECODER("DSA", "yes", "mblob", msblob_to_dsa_decoder_functions),
+ DECODER("DSA", "yes", "der", ossl_der_to_dsa_decoder_functions),
+ DECODER("DSA", "yes", "mblob", ossl_msblob_to_dsa_decoder_functions),
# ifndef OPENSSL_NO_RC4
- DECODER("DSA", "yes", "pvk", pvk_to_dsa_decoder_functions),
+ DECODER("DSA", "yes", "pvk", ossl_pvk_to_dsa_decoder_functions),
# endif
#endif
#ifndef OPENSSL_NO_EC
- DECODER("EC", "yes", "der", der_to_ec_decoder_functions),
- DECODER("ED25519", "yes", "der", der_to_ed25519_decoder_functions),
- DECODER("ED448", "yes", "der", der_to_ed448_decoder_functions),
- DECODER("X25519", "yes", "der", der_to_x25519_decoder_functions),
- DECODER("X448", "yes", "der", der_to_x448_decoder_functions),
+ DECODER("EC", "yes", "der", ossl_der_to_ec_decoder_functions),
+ DECODER("ED25519", "yes", "der", ossl_der_to_ed25519_decoder_functions),
+ DECODER("ED448", "yes", "der", ossl_der_to_ed448_decoder_functions),
+ DECODER("X25519", "yes", "der", ossl_der_to_x25519_decoder_functions),
+ DECODER("X448", "yes", "der", ossl_der_to_x448_decoder_functions),
#endif
- DECODER("RSA", "yes", "der", der_to_rsa_decoder_functions),
- DECODER("RSA-PSS", "yes", "der", der_to_rsapss_decoder_functions),
+ DECODER("RSA", "yes", "der", ossl_der_to_rsa_decoder_functions),
+ DECODER("RSA-PSS", "yes", "der", ossl_der_to_rsapss_decoder_functions),
#ifndef OPENSSL_NO_DSA
- DECODER("RSA", "yes", "mblob", msblob_to_rsa_decoder_functions),
+ DECODER("RSA", "yes", "mblob", ossl_msblob_to_rsa_decoder_functions),
# ifndef OPENSSL_NO_RC4
- DECODER("RSA", "yes", "pvk", pvk_to_rsa_decoder_functions),
+ DECODER("RSA", "yes", "pvk", ossl_pvk_to_rsa_decoder_functions),
# endif
#endif
- DECODER("DER", "yes", "pem", pem_to_der_decoder_functions),
+ DECODER("DER", "yes", "pem", ossl_pem_to_der_decoder_functions),
diff --git a/providers/defltprov.c b/providers/defltprov.c
index dee48fb255..542e120c8f 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -98,32 +98,34 @@ static int deflt_get_params(void *provctx, OSSL_PARAM params[])
*/
static const OSSL_ALGORITHM deflt_digests[] = {
/* Our primary name:NIST name[:our older names] */
- { "SHA1:SHA-1:SSL3-SHA1", "provider=default", sha1_functions },
- { "SHA2-224:SHA-224:SHA224", "provider=default", sha224_functions },
- { "SHA2-256:SHA-256:SHA256", "provider=default", sha256_functions },
- { "SHA2-384:SHA-384:SHA384", "provider=default", sha384_functions },
- { "SHA2-512:SHA-512:SHA512", "provider=default", sha512_functions },
+ { "SHA1:SHA-1:SSL3-SHA1", "provider=default", ossl_sha1_functions },
+ { "SHA2-224:SHA-224:SHA224", "provider=default", ossl_sha224_functions },
+ { "SHA2-256:SHA-256:SHA256", "provider=default", ossl_sha256_functions },
+ { "SHA2-384:SHA-384:SHA384", "provider=default", ossl_sha384_functions },
+ { "SHA2-512:SHA-512:SHA512", "provider=default", ossl_sha512_functions },
{ "SHA2-512/224:SHA-512/224:SHA512-224", "provider=default",
- sha512_224_functions },
+ ossl_sha512_224_functions },
{ "SHA2-512/256:SHA-512/256:SHA512-256", "provider=default",
- sha512_256_functions },
+ ossl_sha512_256_functions },
/* We agree with NIST here, so one name only */
- { "SHA3-224", "provider=default", sha3_224_functions },
- { "SHA3-256", "provider=default", sha3_256_functions },
- { "SHA3-384", "provider=default", sha3_384_functions },
- { "SHA3-512", "provider=default", sha3_512_functions },
+ { "SHA3-224", "provider=default", ossl_sha3_224_functions },
+ { "SHA3-256", "provider=default", ossl_sha3_256_functions },
+ { "SHA3-384", "provider=default", ossl_sha3_384_functions },
+ { "SHA3-512", "provider=default", ossl_sha3_512_functions },
/*
* KECCAK-KMAC-128 and KECCAK-KMAC-256 as hashes are mostly useful for
* the KMAC-128 and KMAC-256.
*/
- { "KECCAK-KMAC-128:KECCAK-KMAC128", "provider=default", keccak_kmac_128_functions },
- { "KECCAK-KMAC-256:KECCAK-KMAC256", "provider=default", keccak_kmac_256_functions },
+ { "KECCAK-KMAC-128:KECCAK-KMAC128", "provider=default",
+ ossl_keccak_kmac_128_functions },
+ { "KECCAK-KMAC-256:KECCAK-KMAC256", "provider=default",
+ ossl_keccak_kmac_256_functions },
/* Our primary name:NIST name */
- { "SHAKE-128:SHAKE128", "provider=default", shake_128_functions },
- { "SHAKE-256:SHAKE256", "provider=default", shake_256_functions },
+ { "SHAKE-128:SHAKE128", "provider=default", ossl_shake_128_functions },
+ { "SHAKE-256:SHAKE256", "provider=default", ossl_shake_256_functions },
#ifndef OPENSSL_NO_BLAKE2
/*
@@ -133,159 +135,159 @@ static const OSSL_ALGORITHM deflt_digests[] = {
* If we assume that "2b" and "2s" are versions, that pattern
* fits with ours. We also add our historical names.
*/
- { "BLAKE2S-256:BLAKE2s256", "provider=default", blake2s256_functions },
- { "BLAKE2B-512:BLAKE2b512", "provider=default", blake2b512_functions },
+ { "BLAKE2S-256:BLAKE2s256", "provider=default", ossl_blake2s256_functions },
+ { "BLAKE2B-512:BLAKE2b512", "provider=default", ossl_blake2b512_functions },
#endif /* OPENSSL_NO_BLAKE2 */
#ifndef OPENSSL_NO_SM3
- { "SM3", "provider=default", sm3_functions },
+ { "SM3", "provider=default", ossl_sm3_functions },
#endif /* OPENSSL_NO_SM3 */
#ifndef OPENSSL_NO_MD5
- { "MD5:SSL3-MD5", "provider=default", md5_functions },
- { "MD5-SHA1", "provider=default", md5_sha1_functions },
+ { "MD5:SSL3-MD5", "provider=default", ossl_md5_functions },
+ { "MD5-SHA1", "provider=default", ossl_md5_sha1_functions },
#endif /* OPENSSL_NO_MD5 */
{ NULL, NULL, NULL }
};
static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
- ALG("NULL", null_functions),
- ALG("AES-256-ECB", aes256ecb_functions),
- ALG("AES-192-ECB", aes192ecb_functions),
- ALG("AES-128-ECB", aes128ecb_functions),
- ALG("AES-256-CBC:AES256", aes256cbc_functions),
- ALG("AES-192-CBC:AES192", aes192cbc_functions),
- ALG("AES-128-CBC:AES128", aes128cbc_functions),
- ALG("AES-128-CBC-CTS", aes128cbc_cts_functions),
- ALG("AES-192-CBC-CTS", aes192cbc_cts_functions),
- ALG("AES-256-CBC-CTS", aes256cbc_cts_functions),
- ALG("AES-256-OFB", aes256ofb_functions),
- ALG("AES-192-OFB", aes192ofb_functions),
- ALG("AES-128-OFB", aes128ofb_functions),
- ALG("AES-256-CFB", aes256cfb_functions),
- ALG("AES-192-CFB", aes192cfb_functions),
- ALG("AES-128-CFB", aes128cfb_functions),
- ALG("AES-256-CFB1", aes256cfb1_functions),
- ALG("AES-192-CFB1", aes192cfb1_functions),
- ALG("AES-128-CFB1", aes128cfb1_functions),
- ALG("AES-256-CFB8", aes256cfb8_functions),
- ALG("AES-192-CFB8", aes192cfb8_functions),
- ALG("AES-128-CFB8", aes128cfb8_functions),
- ALG("AES-256-CTR", aes256ctr_functions),
- ALG("AES-192-CTR", aes192ctr_functions),
- ALG("AES-128-CTR", aes128ctr_functions),
- ALG("AES-256-XTS", aes256xts_functions),
- ALG("AES-128-XTS", aes128xts_functions),
+ ALG("NULL", ossl_null_functions),
+ ALG("AES-256-ECB", ossl_aes256ecb_functions),
+ ALG("AES-192-ECB", ossl_aes192ecb_functions),
+ ALG("AES-128-ECB", ossl_aes128ecb_functions),
+ ALG("AES-256-CBC:AES256", ossl_aes256cbc_functions),
+ ALG("AES-192-CBC:AES192", ossl_aes192cbc_functions),
+ ALG("AES-128-CBC:AES128", ossl_aes128cbc_functions),
+ ALG("AES-128-CBC-CTS", ossl_aes128cbc_cts_functions),
+ ALG("AES-192-CBC-CTS", ossl_aes192cbc_cts_functions),
+ ALG("AES-256-CBC-CTS", ossl_aes256cbc_cts_functions),
+ ALG("AES-256-OFB", ossl_aes256ofb_functions),
+ ALG("AES-192-OFB", ossl_aes192ofb_functions),
+ ALG("AES-128-OFB", ossl_aes128ofb_functions),
+ ALG("AES-256-CFB", ossl_aes256cfb_functions),
+ ALG("AES-192-CFB", ossl_aes192cfb_functions),
+ ALG("AES-128-CFB", ossl_aes128cfb_functions),
+ ALG("AES-256-CFB1", ossl_aes256cfb1_functions),
+ ALG("AES-192-CFB1", ossl_aes192cfb1_functions),
+ ALG("AES-128-CFB1", ossl_aes128cfb1_functions),
+ ALG("AES-256-CFB8", ossl_aes256cfb8_functions),
+ ALG("AES-192-CFB8", ossl_aes192cfb8_functions),
+ ALG("AES-128-CFB8", ossl_aes128cfb8_functions),
+ ALG("AES-256-CTR", ossl_aes256ctr_functions),
+ ALG("AES-192-CTR", ossl_aes192ctr_functions),
+ ALG("AES-128-CTR", ossl_aes128ctr_functions),
+ ALG("AES-256-XTS", ossl_aes256xts_functions),
+ ALG("AES-128-XTS", ossl_aes128xts_functions),
#ifndef OPENSSL_NO_OCB
- ALG("AES-256-OCB", aes256ocb_functions),
- ALG("AES-192-OCB", aes192ocb_functions),
- ALG("AES-128-OCB", aes128ocb_functions),
+ ALG("AES-256-OCB", ossl_aes256ocb_functions),
+ ALG("AES-192-OCB", ossl_aes192ocb_functions),
+ ALG("AES-128-OCB", ossl_aes128ocb_functions),
#endif /* OPENSSL_NO_OCB */
#ifndef OPENSSL_NO_SIV
- ALG("AES-128-SIV", aes128siv_functions),
- ALG("AES-192-SIV", aes192siv_functions),
- ALG("AES-256-SIV", aes256siv_functions),
+ ALG("AES-128-SIV", ossl_aes128siv_functions),
+ ALG("AES-192-SIV", ossl_aes192siv_functions),
+ ALG("AES-256-SIV", ossl_aes256siv_functions),
#endif /* OPENSSL_NO_SIV */
- ALG("AES-256-GCM:id-aes256-GCM", aes256gcm_functions),
- ALG("AES-192-GCM:id-aes192-GCM", aes192gcm_functions),
- ALG("AES-128-GCM:id-aes128-GCM", aes128gcm_functions),
- ALG("AES-256-CCM:id-aes256-CCM", aes256ccm_functions),
- ALG("AES-192-CCM:id-aes192-CCM", aes192ccm_functions),
- ALG("AES-128-CCM:id-aes128-CCM", aes128ccm_functions),
- ALG("AES-256-WRAP:id-aes256-wrap:AES256-WRAP", aes256wra