From: Richard Levitte <levitte@openssl.org>
Date: Fri, 10 Jul 2020 13:08:29 +0000 (+0200)
Subject: SERIALIZER: No enc argument for OSSL_SERIALIZER_CTX_set_passphrase_cb()
X-Git-Tag: openssl-3.0.0-alpha6~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45396db0e3bfd796e89669baf3a3ecc9602d36d5;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/crypto/pem/pem_local.h b/crypto/pem/pem_local.h
index 3b501abde78..9563925f73e 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 8dbcb65bf73..12a25b7a826 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;
             }
         }
diff --git a/crypto/serializer/serializer_pkey.c b/crypto/serializer/serializer_pkey.c
index 1e7fc3eafbd..35ddb92bd4a 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;
diff --git a/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod b/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
index 43dddbce027..5797ab1caa8 100644
--- a/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
+++ b/doc/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.pod
@@ -31,7 +31,7 @@ OSSL_SERIALIZER_Parameters_TO_TEXT_PQ
  int OSSL_SERIALIZER_CTX_set_passphrase(OSSL_SERIALIZER_CTX *ctx,
                                         const unsigned char *kstr,
                                         size_t klen);
- 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);
  int OSSL_SERIALIZER_CTX_set_passphrase_ui(OSSL_SERIALIZER_CTX *ctx,
                                            const UI_METHOD *ui_method,
diff --git a/include/openssl/deserializer.h b/include/openssl/deserializer.h
index e8752a6d1cd..d54e47915da 100644
--- a/include/openssl/deserializer.h
+++ b/include/openssl/deserializer.h
@@ -61,7 +61,7 @@ int OSSL_DESERIALIZER_CTX_set_cipher(OSSL_DESERIALIZER_CTX *ctx,
 int OSSL_DESERIALIZER_CTX_set_passphrase(OSSL_DESERIALIZER_CTX *ctx,
                                          const unsigned char *kstr,
                                          size_t klen);
-int OSSL_DESERIALIZER_CTX_set_passphrase_cb(OSSL_DESERIALIZER_CTX *ctx, int enc,
+int OSSL_DESERIALIZER_CTX_set_passphrase_cb(OSSL_DESERIALIZER_CTX *ctx,
                                             pem_password_cb *cb, void *cbarg);
 int OSSL_DESERIALIZER_CTX_set_passphrase_ui(OSSL_DESERIALIZER_CTX *ctx,
                                             const UI_METHOD *ui_method,
diff --git a/include/openssl/serializer.h b/include/openssl/serializer.h
index 8b24840786d..50c85d617fe 100644
--- a/include/openssl/serializer.h
+++ b/include/openssl/serializer.h
@@ -61,7 +61,7 @@ int OSSL_SERIALIZER_CTX_set_cipher(OSSL_SERIALIZER_CTX *ctx,
 int OSSL_SERIALIZER_CTX_set_passphrase(OSSL_SERIALIZER_CTX *ctx,
                                        const unsigned char *kstr,
                                        size_t klen);
-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);
 int OSSL_SERIALIZER_CTX_set_passphrase_ui(OSSL_SERIALIZER_CTX *ctx,
                                           const UI_METHOD *ui_method,