mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

PROV: Make the DER to KEY deserializer decode parameters too

Browse Source 
It should be noted that this may be dodgy if we ever encounter
parameter objects that look like something else.  However, experience
with the OSSL_STORE 'file:' loader, which does exactly this kind of
thing, has worked fine so far.

A possibility could be that to decode parameters specifically, we
demand that there's an incoming data type specifying this, which
demands by extension that parameters can only come from a file format
that has the parameter type encoded, such as PEM.  This would be a
future effort.

Fixes #12568

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12569)
This commit is contained in:
Richard Levitte 2020-08-02 13:12:54 +02:00 committed by Pauli
parent 19b4e6f8fe
commit b5b6669fb6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
providers/implementations/serializers/deserialize_der2key.c
View File

@ -130,6 +130,11 @@ static int der2key_deserialize(void *vctx, OSSL_CORE_BIO *cin,
pkey = d2i_PUBKEY(NULL, &derp, der_len);
}
if (pkey == NULL) {
derp = der;
pkey = d2i_KeyParams(ctx->desc->type, NULL, &derp, der_len);
}
if (pkey != NULL) {
/*
* Tear out the low-level key pointer from the pkey,