summaryrefslogtreecommitdiff
path: root/crypto/encode_decode/encoder_pkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/encode_decode/encoder_pkey.c')
-rw-r--r--crypto/encode_decode/encoder_pkey.c95
1 files changed, 47 insertions, 48 deletions
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index 97aad8820229..10635337b79e 100644
--- a/crypto/encode_decode/encoder_pkey.c
+++ b/crypto/encode_decode/encoder_pkey.c
@@ -24,44 +24,42 @@
DEFINE_STACK_OF(OSSL_ENCODER)
int OSSL_ENCODER_CTX_set_cipher(OSSL_ENCODER_CTX *ctx,
- const char *cipher_name,
- const char *propquery)
+ const char *cipher_name,
+ const char *propquery)
{
OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END };
- params[0] =
- OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
- (void *)cipher_name, 0);
- params[1] =
- OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
- (void *)propquery, 0);
+ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
+ (void *)cipher_name, 0);
+ params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
+ (void *)propquery, 0);
return OSSL_ENCODER_CTX_set_params(ctx, params);
}
int OSSL_ENCODER_CTX_set_passphrase(OSSL_ENCODER_CTX *ctx,
- const unsigned char *kstr,
- size_t klen)
+ const unsigned char *kstr,
+ size_t klen)
{
return ossl_pw_set_passphrase(&ctx->pwdata, kstr, klen);
}
int OSSL_ENCODER_CTX_set_passphrase_ui(OSSL_ENCODER_CTX *ctx,
- const UI_METHOD *ui_method,
- void *ui_data)
+ const UI_METHOD *ui_method,
+ void *ui_data)
{
return ossl_pw_set_ui_method(&ctx->pwdata, ui_method, ui_data);
}
int OSSL_ENCODER_CTX_set_pem_password_cb(OSSL_ENCODER_CTX *ctx,
- pem_password_cb *cb, void *cbarg)
+ pem_password_cb *cb, void *cbarg)
{
return ossl_pw_set_pem_password_cb(&ctx->pwdata, cb, cbarg);
}
int OSSL_ENCODER_CTX_set_passphrase_cb(OSSL_ENCODER_CTX *ctx,
- OSSL_PASSPHRASE_CALLBACK *cb,
- void *cbarg)
+ OSSL_PASSPHRASE_CALLBACK *cb,
+ void *cbarg)
{
return ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, cb, cbarg);
}
@@ -79,7 +77,7 @@ struct collected_encoder_st {
const OSSL_PROVIDER *keymgmt_prov;
OSSL_ENCODER_CTX *ctx;
- unsigned int flag_find_same_provider:1;
+ unsigned int flag_find_same_provider : 1;
int error_occurred;
};
@@ -92,7 +90,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
if (data->error_occurred)
return;
- data->error_occurred = 1; /* Assume the worst */
+ data->error_occurred = 1; /* Assume the worst */
prov = OSSL_ENCODER_get0_provider(encoder);
/*
@@ -111,7 +109,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
match = (data->id_names[i] == encoder->base.id);
else
match = OSSL_ENCODER_is_a(encoder,
- sk_OPENSSL_CSTRING_value(data->names, i));
+ sk_OPENSSL_CSTRING_value(data->names, i));
if (!match
|| (encoder->does_selection != NULL
&& !encoder->does_selection(provctx, data->ctx->selection))
@@ -125,12 +123,12 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
}
}
- data->error_occurred = 0; /* All is good now */
+ data->error_occurred = 0; /* All is good now */
}
struct collected_names_st {
STACK_OF(OPENSSL_CSTRING) *names;
- unsigned int error_occurred:1;
+ unsigned int error_occurred : 1;
};
static void collect_name(const char *name, void *arg)
@@ -140,12 +138,12 @@ static void collect_name(const char *name, void *arg)
if (data->error_occurred)
return;
- data->error_occurred = 1; /* Assume the worst */
+ data->error_occurred = 1; /* Assume the worst */
if (sk_OPENSSL_CSTRING_push(data->names, name) <= 0)
return;
- data->error_occurred = 0; /* All is good now */
+ data->error_occurred = 0; /* All is good now */
}
/*
@@ -170,8 +168,7 @@ static int encoder_import_cb(const OSSL_PARAM params[], void *arg)
OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
void *encoderctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(encoder_inst);
- construct_data->constructed_obj =
- encoder->import_object(encoderctx, construct_data->selection, params);
+ construct_data->constructed_obj = encoder->import_object(encoderctx, construct_data->selection, params);
return (construct_data->constructed_obj != NULL);
}
@@ -182,8 +179,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
struct construct_data_st *data = arg;
if (data->obj == NULL) {
- OSSL_ENCODER *encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
+ OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
const EVP_PKEY *pk = data->pk;
const OSSL_PROVIDER *k_prov = EVP_KEYMGMT_get0_provider(pk->keymgmt);
const OSSL_PROVIDER *e_prov = OSSL_ENCODER_get0_provider(encoder);
@@ -196,7 +192,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
data->encoder_inst = encoder_inst;
if (!evp_keymgmt_export(pk->keymgmt, pk->keydata, selection,
- &encoder_import_cb, data))
+ &encoder_import_cb, data))
return NULL;
data->obj = data->constructed_obj;
} else {
@@ -213,8 +209,7 @@ static void encoder_destruct_pkey(void *arg)
int match = (data->obj == data->constructed_obj);
if (data->encoder_inst != NULL) {
- OSSL_ENCODER *encoder =
- OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
+ OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
encoder->free_object(data->constructed_obj);
}
@@ -230,9 +225,9 @@ static void encoder_destruct_pkey(void *arg)
* and to use fallback methods if the result is NULL.
*/
static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
- const EVP_PKEY *pkey,
- int selection,
- const char *propquery)
+ const EVP_PKEY *pkey,
+ int selection,
+ const char *propquery)
{
struct construct_data_st *data = NULL;
const OSSL_PROVIDER *prov = NULL;
@@ -332,11 +327,11 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
data->pk = pkey;
data->selection = selection;
- data = NULL; /* Avoid it being freed */
+ data = NULL; /* Avoid it being freed */
}
ok = 1;
- err:
+err:
if (data != NULL) {
OSSL_ENCODER_CTX_set_construct_data(ctx, NULL);
OPENSSL_free(data);
@@ -345,10 +340,10 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
}
OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
- int selection,
- const char *output_type,
- const char *output_struct,
- const char *propquery)
+ int selection,
+ const char *output_type,
+ const char *output_struct,
+ const char *propquery)
{
OSSL_ENCODER_CTX *ctx = NULL;
OSSL_LIB_CTX *libctx = NULL;
@@ -360,7 +355,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
if (!evp_pkey_is_assigned(pkey)) {
ERR_raise_data(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_INVALID_ARGUMENT,
- "The passed EVP_PKEY must be assigned a key");
+ "The passed EVP_PKEY must be assigned a key");
return NULL;
}
@@ -375,13 +370,15 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
libctx = ossl_provider_libctx(prov);
}
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out,
- "(ctx %p) Looking for %s encoders with selection %d\n",
- (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
+ "(ctx %p) Looking for %s encoders with selection %d\n",
+ (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
BIO_printf(trc_out, " output type: %s, output structure: %s\n",
- output_type, output_struct);
- } OSSL_TRACE_END(ENCODER);
+ output_type, output_struct);
+ }
+ OSSL_TRACE_END(ENCODER);
if (OSSL_ENCODER_CTX_set_output_type(ctx, output_type)
&& (output_struct == NULL
@@ -393,14 +390,16 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
int save_parameters = pkey->save_parameters;
params[0] = OSSL_PARAM_construct_int(OSSL_ENCODER_PARAM_SAVE_PARAMETERS,
- &save_parameters);
+ &save_parameters);
/* ignoring error as this is only auxiliary parameter */
(void)OSSL_ENCODER_CTX_set_params(ctx, params);
- OSSL_TRACE_BEGIN(ENCODER) {
+ OSSL_TRACE_BEGIN(ENCODER)
+ {
BIO_printf(trc_out, "(ctx %p) Got %d encoders\n",
- (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
- } OSSL_TRACE_END(ENCODER);
+ (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
+ }
+ OSSL_TRACE_END(ENCODER);
return ctx;
}