[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  15e5b96933e98fe3046ce4e881c42ee07e8fe255 (commit)
      from  e32c608e0733d5b295c9aa119153133413c5d744 (commit)


- Log -----------------------------------------------------------------
commit 15e5b96933e98fe3046ce4e881c42ee07e8fe255
Author: André Klitzing <aklitzing at gmail.com>
Date:   Sat Feb 29 23:40:29 2020 +0100

    Fix drop of const qualifier
    
    The parameter got "const" in 9fdcc21fdc9 but that was not added
    to cast. So this throws a -Wcast-qual in user code.
    
    error: cast from 'const DUMMY *' to 'ASN1_VALUE_st *' drops const qualifier [-Werror,-Wcast-qual]
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11210)

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

Summary of changes:
 include/openssl/asn1t.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 754cab5f3d..934b10c2a6 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -814,13 +814,13 @@ typedef struct ASN1_STREAM_ARG_st {
         } \
         int i2d_##fname(const stname *a, unsigned char **out) \
         { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
+                return ASN1_item_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
         }
 
 # define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
         int i2d_##stname##_NDEF(const stname *a, unsigned char **out) \
         { \
-                return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
+                return ASN1_item_ndef_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
         }
 
 # define IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(stname) \
@@ -832,7 +832,7 @@ typedef struct ASN1_STREAM_ARG_st {
         } \
         static int i2d_##stname(const stname *a, unsigned char **out) \
         { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, \
+                return ASN1_item_i2d((const ASN1_VALUE *)a, out, \
                                      ASN1_ITEM_rptr(stname)); \
         }
 
@@ -849,7 +849,7 @@ typedef struct ASN1_STREAM_ARG_st {
         int fname##_print_ctx(BIO *out, const stname *x, int indent, \
                                                 const ASN1_PCTX *pctx) \
         { \
-                return ASN1_item_print(out, (ASN1_VALUE *)x, indent, \
+                return ASN1_item_print(out, (const ASN1_VALUE *)x, indent, \
                         ASN1_ITEM_rptr(itname), pctx); \
         }