summaryrefslogtreecommitdiff
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-10-17 08:34:47 +0200
committerRichard Levitte <levitte@openssl.org>2020-11-11 12:43:27 +0100
commitc319b6276bf84da2676b4b70f40f7ce897649f72 (patch)
treeab586fa1510447371e445ece2434d9c4fe6e87db /providers/defltprov.c
parent0b9f90f5043e4cb8559448fb6270b0e7dd74e4b9 (diff)
downloadopenssl-new-c319b6276bf84da2676b4b70f40f7ce897649f72.tar.gz
PROV: Re-implement all the keypair encoders
The base functionality to implement the keypair encoders 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 output, the output type ("TEXT", "DER" or "PEM") and the outermost output 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: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/13167)
Diffstat (limited to 'providers/defltprov.c')
-rw-r--r--providers/defltprov.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 8ce6c92b3e..b309ba798c 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -442,15 +442,11 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
};
static const OSSL_ALGORITHM deflt_encoder[] = {
-#define ENCODER(name, _fips, _output, func_table) \
- { name, \
- "provider=default,fips=" _fips ",output=" _output, \
- (func_table) }
-
+#define ENCODER_PROVIDER "default"
#include "encoders.inc"
{ NULL, NULL, NULL }
+#undef ENCODER_PROVIDER
};
-#undef ENCODER
static const OSSL_ALGORITHM deflt_decoder[] = {
#define DECODER_PROVIDER "default"