[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  095d2f0f8a11f8785eb8451dd8eeee60bebece20 (commit)
      from  a3a0b4105709c1312d55906e5f3ee9b69d4af1d6 (commit)


- Log -----------------------------------------------------------------
commit 095d2f0f8a11f8785eb8451dd8eeee60bebece20
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Aug 18 16:48:33 2016 +0100

    Constify i2a*
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/asn1/f_int.c      | 2 +-
 crypto/asn1/f_string.c   | 2 +-
 crypto/x509v3/v3_info.c  | 2 +-
 include/openssl/asn1.h   | 4 ++--
 include/openssl/x509v3.h | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
index c203480..51fc884 100644
--- a/crypto/asn1/f_int.c
+++ b/crypto/asn1/f_int.c
@@ -153,7 +153,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
     return 0;
 }
 
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a)
+int i2a_ASN1_ENUMERATED(BIO *bp, const ASN1_ENUMERATED *a)
 {
     return i2a_ASN1_INTEGER(bp, a);
 }
diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index 0e03139..b9258bb 100644
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -13,7 +13,7 @@
 #include <openssl/buffer.h>
 #include <openssl/asn1.h>
 
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
+int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type)
 {
     int i, n = 0;
     static const char *h = "0123456789ABCDEF";
diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c
index bec8c42..61ef213 100644
--- a/crypto/x509v3/v3_info.c
+++ b/crypto/x509v3/v3_info.c
@@ -150,7 +150,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
     return NULL;
 }
 
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a)
+int i2a_ACCESS_DESCRIPTION(BIO *bp, const ACCESS_DESCRIPTION *a)
 {
     i2a_ASN1_OBJECT(bp, a->method);
     return 2;
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index afd3b1c..0315091 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -631,11 +631,11 @@ int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 
 int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);
 int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
+int i2a_ASN1_ENUMERATED(BIO *bp, const ASN1_ENUMERATED *a);
 int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size);
 int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a);
 int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
+int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type);
 int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a);
 
 int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index 5ca76a0..c6960f2 100644
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -506,7 +506,7 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
                                          X509V3_CTX *ctx, char *str);
 
 DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a);
+int i2a_ACCESS_DESCRIPTION(BIO *bp, const ACCESS_DESCRIPTION *a);
 
 DECLARE_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)