From 45396db0e3bfd796e89669baf3a3ecc9602d36d5 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 10 Jul 2020 15:08:29 +0200 Subject: 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 Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/12410) --- crypto/pem/pem_local.h | 2 +- crypto/pem/pem_pk8.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'crypto/pem') diff --git a/crypto/pem/pem_local.h b/crypto/pem/pem_local.h index 3b501abde7..9563925f73 100644 --- a/crypto/pem/pem_local.h +++ b/crypto/pem/pem_local.h @@ -45,7 +45,7 @@ && !OSSL_SERIALIZER_CTX_set_passphrase(ctx, kstr, klen)) \ ret = 0; \ else if (cb != NULL \ - && !OSSL_SERIALIZER_CTX_set_passphrase_cb(ctx, 1, \ + && !OSSL_SERIALIZER_CTX_set_passphrase_cb(ctx, \ cb, u)) \ ret = 0; \ } \ diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c index 8dbcb65bf7..12a25b7a82 100644 --- a/crypto/pem/pem_pk8.c +++ b/crypto/pem/pem_pk8.c @@ -109,8 +109,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid, && !OSSL_SERIALIZER_CTX_set_passphrase(ctx, ukstr, klen)) ret = 0; else if (cb != NULL - && !OSSL_SERIALIZER_CTX_set_passphrase_cb(ctx, 1, - cb, u)) + && !OSSL_SERIALIZER_CTX_set_passphrase_cb(ctx, cb, u)) ret = 0; } } -- cgit v1.2.3