From: Dr. Stephen Henson Date: Thu, 18 Aug 2016 15:48:33 +0000 (+0100) Subject: Constify i2a* X-Git-Tag: OpenSSL_1_1_0~139 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=095d2f0f8a11f8785eb8451dd8eeee60bebece20;p=oweals%2Fopenssl.git Constify i2a* Reviewed-by: Rich Salz --- diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index c2034809da..51fc884b5e 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 0e03139344..b9258bba8b 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -13,7 +13,7 @@ #include #include -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 bec8c425b0..61ef2138b7 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 afd3b1c587..0315091652 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 5ca76a0277..c6960f2c9e 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)