[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  796948cd733d2bd0d8acbaf2354c718bcd4352a6 (commit)
      from  a829b735b645516041b55746e013692babd8cd31 (commit)


- Log -----------------------------------------------------------------
commit 796948cd733d2bd0d8acbaf2354c718bcd4352a6
Author: Akshit Akhoury <akshit.akhoury at citrix.com>
Date:   Fri Oct 2 22:28:36 2020 +0530

    Changing X509at_get0_data_by_OBJ to expect const stack of X509_ATTRIBUTE
    
    CLA: trivial
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13062)

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

Summary of changes:
 crypto/x509/x509_att.c    | 2 +-
 include/openssl/x509.h.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index d93d757aef..6966d12c20 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -149,7 +149,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
     return ret;
 }
 
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
+void *X509at_get0_data_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *x,
                               const ASN1_OBJECT *obj, int lastpos, int type)
 {
     int i;
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in
index 1c4a13aa42..eda5ee986f 100644
--- a/include/openssl/x509.h.in
+++ b/include/openssl/x509.h.in
@@ -975,7 +975,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
                                                   int type,
                                                   const unsigned char *bytes,
                                                   int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
+void *X509at_get0_data_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *x,
                               const ASN1_OBJECT *obj, int lastpos, int type);
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
                                              int atrtype, const void *data,