summaryrefslogtreecommitdiffstats
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-07-09 19:09:40 +0200
committerRichard Levitte <levitte@openssl.org>2020-07-24 16:35:10 +0200
commitdcfacbbfe9b3f8fa13eeb17a8fa4c89edefc8389 (patch)
tree0b202a14254f2d444995c0ae9da3ce38903057d4 /providers/defltprov.c
parent1017b8e4a161682c909a98ebf3f7a21b38d6c677 (diff)
PROV: Implement PEM to DER deserializer
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12410)
Diffstat (limited to 'providers/defltprov.c')
-rw-r--r--providers/defltprov.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 7d8681bb16..7ab006ae83 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -538,6 +538,9 @@ static const OSSL_ALGORITHM deflt_deserializer[] = {
{ "RSA", "provider=default,fips=yes,input=der",
der_to_rsa_deserializer_functions },
+ { "DER", "provider=default,fips=yes,input=pem",
+ pem_to_der_deserializer_functions },
+
{ NULL, NULL, NULL }
};