[openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  434343f896a2bb3e5857cc9831c38f8cd1cceec1 (commit)
      from  6600baa9bb6e59be91692791a6251c172a099a65 (commit)


- Log -----------------------------------------------------------------
commit 434343f896a2bb3e5857cc9831c38f8cd1cceec1
Author: olszomal <malgorzata.olszo...@stunnel.org>
Date:   Fri Jun 19 15:00:32 2020 +0200

    Add const to 'ppin' function parameter
    
    CLA: trivial
    
    Reviewed-by: Kurt Roeckx <k...@roeckx.be>
    Reviewed-by: Matt Caswell <m...@openssl.org>
    GH: #12205

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

Summary of changes:
 doc/man3/d2i_DHparams.pod | 2 +-
 doc/man3/d2i_X509.pod     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/man3/d2i_DHparams.pod b/doc/man3/d2i_DHparams.pod
index c554099816..83c3fd9c4b 100644
--- a/doc/man3/d2i_DHparams.pod
+++ b/doc/man3/d2i_DHparams.pod
@@ -8,7 +8,7 @@ d2i_DHparams, i2d_DHparams - PKCS#3 DH parameter functions
 
  #include <openssl/dh.h>
 
- DH *d2i_DHparams(DH **a, unsigned char **pp, long length);
+ DH *d2i_DHparams(DH **a, const unsigned char **pp, long length);
  int i2d_DHparams(DH *a, unsigned char **pp);
 
 =head1 DESCRIPTION
diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index 971339bba0..a46977bc93 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -397,7 +397,7 @@ i2d_X509_VAL,
 
 =for openssl generic
 
- TYPE *d2i_TYPE(TYPE **a, unsigned char **ppin, long length);
+ TYPE *d2i_TYPE(TYPE **a, const unsigned char **ppin, long length);
  TYPE *d2i_TYPE_bio(BIO *bp, TYPE **a);
  TYPE *d2i_TYPE_fp(FILE *fp, TYPE **a);
 
@@ -564,7 +564,8 @@ Allocate and encode the DER encoding of an X509 structure:
 Attempt to decode a buffer:
 
  X509 *x;
- unsigned char *buf, *p;
+ unsigned char *buf;
+ const unsigned char *p;
  int len;
 
  /* Set up buf and len to point to the input buffer. */
@@ -576,7 +577,8 @@ Attempt to decode a buffer:
 Alternative technique:
 
  X509 *x;
- unsigned char *buf, *p;
+ unsigned char *buf;
+ const unsigned char *p;
  int len;
 
  /* Set up buf and len to point to the input buffer. */