diff options
author | Richard Levitte <levitte@openssl.org> | 2020-09-14 09:31:36 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-09-20 17:31:22 +0200 |
commit | 111dc4b0f1e961afd6fc998ef443d9004356c046 (patch) | |
tree | 59712229b3ebf6ea2d967b43b07ad55f2a1bcb08 /providers/implementations/include | |
parent | b8975c68b1a7796993759db22905d0ef05f7e077 (diff) |
ENCODER: Refactor our provider encoder implementations
This only refactors them for the changed API, there's not yet a
separate DER to PEM encoder and therefore no chaining possibility
yet.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12873)
Diffstat (limited to 'providers/implementations/include')
-rw-r--r-- | providers/implementations/include/prov/implementations.h | 89 |
1 files changed, 32 insertions, 57 deletions
diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h index 36a0d4b3d2..5c5f47f12e 100644 --- a/providers/implementations/include/prov/implementations.h +++ b/providers/implementations/include/prov/implementations.h @@ -308,70 +308,45 @@ extern const OSSL_DISPATCH rsa_asym_cipher_functions[]; extern const OSSL_DISPATCH rsa_asym_kem_functions[]; /* Encoders */ -extern const OSSL_DISPATCH rsa_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH rsa_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH rsa_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH rsa_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH rsa_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH rsa_pub_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH rsa_to_der_encoder_functions[]; +extern const OSSL_DISPATCH rsa_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH rsa_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dh_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dh_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dh_param_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dh_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dh_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dh_param_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dh_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH dh_pub_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH dh_param_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH rsapss_to_der_encoder_functions[]; +extern const OSSL_DISPATCH rsapss_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH rsapss_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dsa_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dsa_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dsa_param_to_text_encoder_functions[]; -extern const OSSL_DISPATCH dsa_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dsa_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dsa_param_to_der_encoder_functions[]; -extern const OSSL_DISPATCH dsa_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH dsa_pub_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH dsa_param_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dh_to_der_encoder_functions[]; +extern const OSSL_DISPATCH dh_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dh_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x25519_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x25519_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x25519_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH x25519_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH x25519_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH x25519_pub_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dhx_to_der_encoder_functions[]; +extern const OSSL_DISPATCH dhx_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dhx_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x448_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x448_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH x448_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH x448_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH x448_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH x448_pub_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dsa_to_der_encoder_functions[]; +extern const OSSL_DISPATCH dsa_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH dsa_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH ed25519_pub_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH x25519_to_der_encoder_functions[]; +extern const OSSL_DISPATCH x25519_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH x25519_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed448_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed448_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ed448_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ed448_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ed448_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH ed448_pub_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH x448_to_der_encoder_functions[]; +extern const OSSL_DISPATCH x448_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH x448_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ec_priv_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ec_pub_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ec_param_to_text_encoder_functions[]; -extern const OSSL_DISPATCH ec_priv_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ec_pub_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ec_param_to_der_encoder_functions[]; -extern const OSSL_DISPATCH ec_priv_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH ec_pub_to_pem_encoder_functions[]; -extern const OSSL_DISPATCH ec_param_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH ed25519_to_der_encoder_functions[]; +extern const OSSL_DISPATCH ed25519_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH ed25519_to_text_encoder_functions[]; + +extern const OSSL_DISPATCH ed448_to_der_encoder_functions[]; +extern const OSSL_DISPATCH ed448_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH ed448_to_text_encoder_functions[]; + +extern const OSSL_DISPATCH ec_to_der_encoder_functions[]; +extern const OSSL_DISPATCH ec_to_pem_encoder_functions[]; +extern const OSSL_DISPATCH ec_to_text_encoder_functions[]; /* Decoders */ extern const OSSL_DISPATCH der_to_dh_decoder_functions[]; |