QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-07 15:09:42 +00:00
Code Issues Projects Releases Wiki Activity

OSSL_STORE: Make sure the called OSSL_DECODER knows what to expect

Browse Source 
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13248)
This commit is contained in:
Richard Levitte 2020-10-28 19:13:46 +01:00
parent 8d8fee6400
commit 9787b5b81f
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
crypto/store/store_result.c
View File

@ -253,9 +253,28 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
OSSL_DECODER_CTX *decoderctx = NULL; OSSL_DECODER_CTX *decoderctx = NULL;
const unsigned char *pdata = data->octet_data; const unsigned char *pdata = data->octet_data;
size_t pdatalen = data->octet_data_size; size_t pdatalen = data->octet_data_size;
int selection = 0;
switch (ctx->expected_type) {
case 0:
break;
case OSSL_STORE_INFO_PARAMS:
selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
break;
case OSSL_STORE_INFO_PUBKEY:
selection =
OSSL_KEYMGMT_SELECT_PUBLIC_KEY
| OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
break;
case OSSL_STORE_INFO_PKEY:
selection = OSSL_KEYMGMT_SELECT_ALL;
break;
default:
return NULL;
}
decoderctx = decoderctx =
OSSL_DECODER_CTX_new_by_EVP_PKEY(&pk, NULL, NULL, NULL, 0, OSSL_DECODER_CTX_new_by_EVP_PKEY(&pk, NULL, NULL, NULL, selection,
libctx, propq); libctx, propq);
(void)OSSL_DECODER_CTX_set_passphrase_cb(decoderctx, cb, cbarg); (void)OSSL_DECODER_CTX_set_passphrase_cb(decoderctx, cb, cbarg);
@ -281,14 +300,20 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
SET_ERR_MARK(); SET_ERR_MARK();
/* Try PUBKEY first, that's a real easy target */ /* Try PUBKEY first, that's a real easy target */
derp = der; if (ctx->expected_type == 0
pk = d2i_PUBKEY_ex(NULL, &derp, der_len, libctx, propq); || ctx->expected_type == OSSL_STORE_INFO_PUBKEY) {
if (pk != NULL) derp = der;
*store_info_new = OSSL_STORE_INFO_new_PUBKEY; pk = d2i_PUBKEY_ex(NULL, &derp, der_len, libctx, propq);
RESET_ERR_MARK(); if (pk != NULL)
*store_info_new = OSSL_STORE_INFO_new_PUBKEY;
RESET_ERR_MARK();
}
/* Try private keys next */ /* Try private keys next */
if (pk == NULL) { if (pk == NULL
&& (ctx->expected_type == 0
|| ctx->expected_type == OSSL_STORE_INFO_PKEY)) {
unsigned char *new_der = NULL; unsigned char *new_der = NULL;
X509_SIG *p8 = NULL; X509_SIG *p8 = NULL;
PKCS8_PRIV_KEY_INFO *p8info = NULL; PKCS8_PRIV_KEY_INFO *p8info = NULL;