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/encoders.inc | |
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/encoders.inc')
-rw-r--r-- | providers/encoders.inc | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/providers/encoders.inc b/providers/encoders.inc index fcb1bfe3ec..1ae0d4fb4c 100644 --- a/providers/encoders.inc +++ b/providers/encoders.inc @@ -11,47 +11,47 @@ # error Macro ENCODER undefined #endif - ENCODER("RSA", "yes", "text", rsa_to_text_encoder_functions), - ENCODER("RSA", "yes", "der", rsa_to_der_encoder_functions), - ENCODER("RSA", "yes", "pem", rsa_to_pem_encoder_functions), - ENCODER("RSA-PSS", "yes", "text", rsapss_to_text_encoder_functions), - ENCODER("RSA-PSS", "yes", "der", rsapss_to_der_encoder_functions), - ENCODER("RSA-PSS", "yes", "pem", rsapss_to_pem_encoder_functions), + ENCODER("RSA", "yes", "text", ossl_rsa_to_text_encoder_functions), + ENCODER("RSA", "yes", "der", ossl_rsa_to_der_encoder_functions), + ENCODER("RSA", "yes", "pem", ossl_rsa_to_pem_encoder_functions), + ENCODER("RSA-PSS", "yes", "text", ossl_rsapss_to_text_encoder_functions), + ENCODER("RSA-PSS", "yes", "der", ossl_rsapss_to_der_encoder_functions), + ENCODER("RSA-PSS", "yes", "pem", ossl_rsapss_to_pem_encoder_functions), #ifndef OPENSSL_NO_DH - ENCODER("DH", "yes", "text", dh_to_text_encoder_functions), - ENCODER("DH", "yes", "der", dh_to_der_encoder_functions), - ENCODER("DH", "yes", "pem", dh_to_pem_encoder_functions), + ENCODER("DH", "yes", "text", ossl_dh_to_text_encoder_functions), + ENCODER("DH", "yes", "der", ossl_dh_to_der_encoder_functions), + ENCODER("DH", "yes", "pem", ossl_dh_to_pem_encoder_functions), - ENCODER("DHX", "yes", "text", dhx_to_text_encoder_functions), - ENCODER("DHX", "yes", "der", dhx_to_der_encoder_functions), - ENCODER("DHX", "yes", "pem", dhx_to_pem_encoder_functions), + ENCODER("DHX", "yes", "text", ossl_dhx_to_text_encoder_functions), + ENCODER("DHX", "yes", "der", ossl_dhx_to_der_encoder_functions), + ENCODER("DHX", "yes", "pem", ossl_dhx_to_pem_encoder_functions), #endif #ifndef OPENSSL_NO_DSA - ENCODER("DSA", "yes", "text", dsa_to_text_encoder_functions), - ENCODER("DSA", "yes", "der", dsa_to_der_encoder_functions), - ENCODER("DSA", "yes", "pem", dsa_to_pem_encoder_functions), + ENCODER("DSA", "yes", "text", ossl_dsa_to_text_encoder_functions), + ENCODER("DSA", "yes", "der", ossl_dsa_to_der_encoder_functions), + ENCODER("DSA", "yes", "pem", ossl_dsa_to_pem_encoder_functions), #endif #ifndef OPENSSL_NO_EC - ENCODER("X25519", "yes", "text", x25519_to_text_encoder_functions), - ENCODER("X25519", "yes", "der", x25519_to_der_encoder_functions), - ENCODER("X25519", "yes", "pem", x25519_to_pem_encoder_functions), + ENCODER("X25519", "yes", "text", ossl_x25519_to_text_encoder_functions), + ENCODER("X25519", "yes", "der", ossl_x25519_to_der_encoder_functions), + ENCODER("X25519", "yes", "pem", ossl_x25519_to_pem_encoder_functions), - ENCODER("X448", "yes", "text", x448_to_text_encoder_functions), - ENCODER("X448", "yes", "der", x448_to_der_encoder_functions), - ENCODER("X448", "yes", "pem", x448_to_pem_encoder_functions), + ENCODER("X448", "yes", "text", ossl_x448_to_text_encoder_functions), + ENCODER("X448", "yes", "der", ossl_x448_to_der_encoder_functions), + ENCODER("X448", "yes", "pem", ossl_x448_to_pem_encoder_functions), - ENCODER("ED25519", "yes", "text", ed25519_to_text_encoder_functions), - ENCODER("ED25519", "yes", "der", ed25519_to_der_encoder_functions), - ENCODER("ED25519", "yes", "pem", ed25519_to_pem_encoder_functions), + ENCODER("ED25519", "yes", "text", ossl_ed25519_to_text_encoder_functions), + ENCODER("ED25519", "yes", "der", ossl_ed25519_to_der_encoder_functions), + ENCODER("ED25519", "yes", "pem", ossl_ed25519_to_pem_encoder_functions), - ENCODER("ED448", "yes", "text", ed448_to_text_encoder_functions), - ENCODER("ED448", "yes", "der", ed448_to_der_encoder_functions), - ENCODER("ED448", "yes", "pem", ed448_to_pem_encoder_functions), + ENCODER("ED448", "yes", "text", ossl_ed448_to_text_encoder_functions), + ENCODER("ED448", "yes", "der", ossl_ed448_to_der_encoder_functions), + ENCODER("ED448", "yes", "pem", ossl_ed448_to_pem_encoder_functions), - ENCODER("EC", "yes", "text", ec_to_text_encoder_functions), - ENCODER("EC", "yes", "der", ec_to_der_encoder_functions), - ENCODER("EC", "yes", "pem", ec_to_pem_encoder_functions), + ENCODER("EC", "yes", "text", ossl_ec_to_text_encoder_functions), + ENCODER("EC", "yes", "der", ossl_ec_to_der_encoder_functions), + ENCODER("EC", "yes", "pem", ossl_ec_to_pem_encoder_functions), #endif |