mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
b305452f69
The KEYMGMT libcrypto <-> provider interface currently makes a few
assumptions:
1. provider side domain parameters and key data isn't mutable. In
other words, as soon as a key has been created in any (loaded,
imported data, ...), it's set in stone.
2. provider side domain parameters can be strictly separated from the
key data.
This does work for the most part, but there are places where that's a
bit too rigid for the functionality that the EVP_PKEY API delivers.
Key data needs to be mutable to allow the flexibility that functions
like EVP_PKEY_copy_parameters promise, as well as to provide the
combinations of data that an EVP_PKEY is generally assumed to be able
to hold:
- domain parameters only
- public key only
- public key + private key
- domain parameters + public key
- domain parameters + public key + private key
To remedy all this, we:
1. let go of the distinction between domain parameters and key
material proper in the libcrypto <-> provider interface.
As a consequence, functions that still need it gain a selection
argument, which is a set of bits that indicate what parts of the
key object are to be considered in a specific call. This allows
a reduction of very similar functions into one.
2. Rework the libcrypto <-> provider interface so provider side key
objects are created and destructed with a separate function, and
get their data filled and extracted in through import and export.
(future work will see other key object constructors and other
functions to fill them with data)
Fixes #10979
squash! Redesign the KEYMGMT libcrypto <-> provider interface - the basics
Remedy 1 needs a rewrite:
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11006)
53 lines
1.5 KiB
C
53 lines
1.5 KiB
C
/*
|
|
* Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/core_numbers.h>
|
|
#include <openssl/types.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "internal/refcount.h"
|
|
|
|
struct ossl_serializer_st {
|
|
OSSL_PROVIDER *prov;
|
|
int id;
|
|
const char *propdef;
|
|
|
|
CRYPTO_REF_COUNT refcnt;
|
|
CRYPTO_RWLOCK *lock;
|
|
|
|
OSSL_OP_serializer_newctx_fn *newctx;
|
|
OSSL_OP_serializer_freectx_fn *freectx;
|
|
OSSL_OP_serializer_set_ctx_params_fn *set_ctx_params;
|
|
OSSL_OP_serializer_settable_ctx_params_fn *settable_ctx_params;
|
|
OSSL_OP_serializer_serialize_data_fn *serialize_data;
|
|
OSSL_OP_serializer_serialize_object_fn *serialize_object;
|
|
};
|
|
|
|
struct ossl_serializer_ctx_st {
|
|
OSSL_SERIALIZER *ser;
|
|
void *serctx;
|
|
|
|
int selection;
|
|
|
|
/*
|
|
* |object| is the libcrypto object to handle.
|
|
* |do_output| must have intimate knowledge of this object.
|
|
*/
|
|
const void *object;
|
|
int (*do_output)(OSSL_SERIALIZER_CTX *ctx, BIO *out);
|
|
|
|
/* For any function that needs a passphrase reader */
|
|
const UI_METHOD *ui_method;
|
|
void *ui_data;
|
|
/*
|
|
* if caller used OSSL_SERIALIZER_CTX_set_passphrase_cb(), we need
|
|
* intermediary storage.
|
|
*/
|
|
UI_METHOD *allocated_ui_method;
|
|
};
|