PROV: Re-implement all the keypair decoders

The base functionality to implement the keypair decoders doesn't
change much, but this results in a more massive amount of
OSSL_DISPATCH and OSSL_ALGORITHM arrays, to support a fine grained
selection of implementation based on what parts of the keypair
structure (combinations of key parameters, public key and private key)
should be expected as input, the input type ("DER", "PEM", ...) and the
outermost input structure ("pkcs8", "SubjectPublicKeyInfo", key
type specific structures, ...).

We add support for the generic structure name "type-specific", to
allow selecting that without knowing the exact name of that structure.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13248)

1 files changed, 60 insertions, 18 deletions

diff --git a/providers/decoders.inc b/providers/decoders.inc
index 4f5699418b..a9119cad79 100644
--- a/providers/decoders.inc
+++ b/providers/decoders.inc
@@ -7,36 +7,78 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef DECODER
-# error Macro DECODER undefined
+#ifndef DECODER_PROVIDER
+# error Macro DECODER_PROVIDER undefined
 #endif
 
+#define DECODER_STRUCTURE_type_specific_keypair         "type-specific"
+#define DECODER_STRUCTURE_type_specific_params          "type-specific"
+#define DECODER_STRUCTURE_type_specific                 "type-specific"
+#define DECODER_STRUCTURE_type_specific_no_pub          "type-specific"
+#define DECODER_STRUCTURE_PKCS8                         "pkcs8"
+#define DECODER_STRUCTURE_SubjectPublicKeyInfo          "SubjectPublicKeyInfo"
+#define DECODER_STRUCTURE_DH                            "dh"
+#define DECODER_STRUCTURE_DHX                           "dhx"
+#define DECODER_STRUCTURE_DSA                           "dsa"
+#define DECODER_STRUCTURE_EC                            "ec"
+#define DECODER_STRUCTURE_RSA                           "rsa"
+
+/* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
+#define DECODER(_name, _input, _output, _fips)                          \
+    { _name,                                                            \
+      "provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input,   \
+      (ossl_##_input##_to_##_output##_decoder_functions) }
+#define DECODER_w_structure(_name, _input, _structure, _output, _fips)  \
+    { _name,                                                            \
+      "provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input    \
+      ",structure=" DECODER_STRUCTURE_##_structure,                     \
+      (ossl_##_structure##_##_input##_to_##_output##_decoder_functions) }
+
 #ifndef OPENSSL_NO_DH
-    DECODER("DH", "yes", "der", ossl_der_to_dh_decoder_functions),
-    DECODER("DHX", "yes", "der", ossl_der_to_dhx_decoder_functions),
+DECODER_w_structure("DH", der, PKCS8, dh, yes),
+DECODER_w_structure("DH", der, SubjectPublicKeyInfo, dh, yes),
+DECODER_w_structure("DH", der, type_specific_params, dh, yes),
+DECODER_w_structure("DH", der, DH, dh, yes),
+DECODER_w_structure("DHX", der, PKCS8, dhx, yes),
+DECODER_w_structure("DHX", der, SubjectPublicKeyInfo, dhx, yes),
+DECODER_w_structure("DHX", der, type_specific_params, dhx, yes),
+DECODER_w_structure("DHX", der, DHX, dhx, yes),
 #endif
 #ifndef OPENSSL_NO_DSA
-    DECODER("DSA", "yes", "der", ossl_der_to_dsa_decoder_functions),
-    DECODER("DSA", "yes", "mblob", ossl_msblob_to_dsa_decoder_functions),
+DECODER_w_structure("DSA", der, PKCS8, dsa, yes),
+DECODER_w_structure("DSA", der, SubjectPublicKeyInfo, dsa, yes),
+DECODER_w_structure("DSA", der, type_specific, dsa, yes),
+DECODER_w_structure("DSA", der, DSA, dsa, yes),
+DECODER("DSA", msblob, dsa, yes),
 # ifndef OPENSSL_NO_RC4
-    DECODER("DSA", "yes", "pvk", ossl_pvk_to_dsa_decoder_functions),
+DECODER("DSA", pvk, dsa, yes),
 # endif
 #endif
 #ifndef OPENSSL_NO_EC
-    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),
+DECODER_w_structure("EC", der, PKCS8, ec, yes),
+DECODER_w_structure("EC", der, SubjectPublicKeyInfo, ec, yes),
+DECODER_w_structure("EC", der, type_specific_no_pub, ec, yes),
+DECODER_w_structure("EC", der, EC, ec, yes),
+DECODER_w_structure("ED25519", der, PKCS8, ed25519, yes),
+DECODER_w_structure("ED25519", der, SubjectPublicKeyInfo, ed25519, yes),
+DECODER_w_structure("ED448", der, PKCS8, ed448, yes),
+DECODER_w_structure("ED448", der, SubjectPublicKeyInfo, ed448, yes),
+DECODER_w_structure("X25519", der, PKCS8, x25519, yes),
+DECODER_w_structure("X25519", der, SubjectPublicKeyInfo, x25519, yes),
+DECODER_w_structure("X448", der, PKCS8, x448, yes),
+DECODER_w_structure("X448", der, SubjectPublicKeyInfo, x448, yes),
 #endif
-    DECODER("RSA", "yes", "der", ossl_der_to_rsa_decoder_functions),
-    DECODER("RSA-PSS", "yes", "der", ossl_der_to_rsapss_decoder_functions),
+DECODER_w_structure("RSA", der, PKCS8, rsa, yes),
+DECODER_w_structure("RSA", der, SubjectPublicKeyInfo, rsa, yes),
+DECODER_w_structure("RSA", der, type_specific_keypair, rsa, yes),
+DECODER_w_structure("RSA", der, RSA, rsa, yes),
+DECODER_w_structure("RSA-PSS", der, PKCS8, rsapss, yes),
+DECODER_w_structure("RSA-PSS", der, SubjectPublicKeyInfo, rsapss, yes),
 #ifndef OPENSSL_NO_DSA
-    DECODER("RSA", "yes", "mblob", ossl_msblob_to_rsa_decoder_functions),
+DECODER("RSA", msblob, rsa, yes),
 # ifndef OPENSSL_NO_RC4
-    DECODER("RSA", "yes", "pvk", ossl_pvk_to_rsa_decoder_functions),
+DECODER("RSA", pvk, rsa, yes),
 # endif
 #endif
 
-    DECODER("DER", "yes", "pem", ossl_pem_to_der_decoder_functions),
-
+DECODER("DER", pem, der, yes),