[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  5fa7789f1b46c6851df4cf8dde403b7f08bf93ea (commit)
      from  797a5b7af9d9bbfbcbff4607c10ad5c5595ac785 (commit)


- Log -----------------------------------------------------------------
commit 5fa7789f1b46c6851df4cf8dde403b7f08bf93ea
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Aug 21 15:28:52 2019 +1000

    Constify param builder string functions.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9649)

-----------------------------------------------------------------------

Summary of changes:
 crypto/param_build.c                      | 4 ++--
 doc/internal/man3/ossl_param_bld_init.pod | 4 ++--
 include/internal/param_build.h            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/param_build.c b/crypto/param_build.c
index 4d28c8737e..db2182196c 100644
--- a/crypto/param_build.c
+++ b/crypto/param_build.c
@@ -160,7 +160,7 @@ int ossl_param_bld_push_BN(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 int ossl_param_bld_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
-                                    char *buf, size_t bsize)
+                                    const char *buf, size_t bsize)
 {
     OSSL_PARAM_BLD_DEF *pd;
 
@@ -198,7 +198,7 @@ int ossl_param_bld_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 int ossl_param_bld_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
-                                     void *buf, size_t bsize)
+                                     const void *buf, size_t bsize)
 {
     OSSL_PARAM_BLD_DEF *pd;
 
diff --git a/doc/internal/man3/ossl_param_bld_init.pod b/doc/internal/man3/ossl_param_bld_init.pod
index 2385ffcab6..4acd8ebf8f 100644
--- a/doc/internal/man3/ossl_param_bld_init.pod
+++ b/doc/internal/man3/ossl_param_bld_init.pod
@@ -36,11 +36,11 @@ ossl_param_bld_push_octet_ptr
                             const BIGNUM *bn);
 
  int ossl_param_bld_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
-                                     char *buf, size_t bsize);
+                                     const char *buf, size_t bsize);
  int ossl_param_bld_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
                                   char *buf, size_t bsize);
  int ossl_param_bld_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
-                                      void *buf, size_t bsize);
+                                      const void *buf, size_t bsize);
  int ossl_param_bld_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
                                    void *buf, size_t bsize);
 
diff --git a/include/internal/param_build.h b/include/internal/param_build.h
index e1235eea29..83f8087020 100644
--- a/include/internal/param_build.h
+++ b/include/internal/param_build.h
@@ -69,10 +69,10 @@ int ossl_param_bld_push_double(OSSL_PARAM_BLD *bld, const char *key,
 int ossl_param_bld_push_BN(OSSL_PARAM_BLD *bld, const char *key,
                            const BIGNUM *bn);
 int ossl_param_bld_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
-                                    char *buf, size_t bsize);
+                                    const char *buf, size_t bsize);
 int ossl_param_bld_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
                                  char *buf, size_t bsize);
 int ossl_param_bld_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
-                                     void *buf, size_t bsize);
+                                     const void *buf, size_t bsize);
 int ossl_param_bld_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
                                   void *buf, size_t bsize);