diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-10 15:08:29 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-07-24 16:43:20 +0200 |
| commit | 45396db0e3bfd796e89669baf3a3ecc9602d36d5 (patch) | |
| tree | 60843db25f88d3049fef12880689c5a35b87f82e /crypto/serializer/serializer_pkey.c | |
| parent | 5a23d78c9b141e31ab9b7d551b2125b124a75e49 (diff) | |
| download | openssl-new-45396db0e3bfd796e89669baf3a3ecc9602d36d5.tar.gz | |
SERIALIZER: No enc argument for OSSL_SERIALIZER_CTX_set_passphrase_cb()
Serialization will only encrypt, so there's no point telling
OSSL_SERIALIZER_CTX_set_passphrase_cb() that's going to happen.
We fix the declaration of OSSL_DESERIALIZER_CTX_set_passphrase_cb()
the same way.
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 'crypto/serializer/serializer_pkey.c')
| -rw-r--r-- | crypto/serializer/serializer_pkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/serializer/serializer_pkey.c b/crypto/serializer/serializer_pkey.c index 1e7fc3eafb..35ddb92bd4 100644 --- a/crypto/serializer/serializer_pkey.c +++ b/crypto/serializer/serializer_pkey.c @@ -71,7 +71,7 @@ int OSSL_SERIALIZER_CTX_set_passphrase_ui(OSSL_SERIALIZER_CTX *ctx, return 1; } -int OSSL_SERIALIZER_CTX_set_passphrase_cb(OSSL_SERIALIZER_CTX *ctx, int enc, +int OSSL_SERIALIZER_CTX_set_passphrase_cb(OSSL_SERIALIZER_CTX *ctx, pem_password_cb *cb, void *cbarg) { if (!ossl_assert(ctx != NULL)) { @@ -83,7 +83,7 @@ int OSSL_SERIALIZER_CTX_set_passphrase_cb(OSSL_SERIALIZER_CTX *ctx, int enc, if (cb == NULL) return 1; ctx->ui_method = - ctx->allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, enc); + ctx->allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 1); ctx->ui_data = cbarg; return ctx->ui_method != NULL; |