diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-07-08 00:37:43 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-07-25 08:20:00 -0400 |
| commit | e83f154f6c19f557251676d9008c75f89f9f5d4a (patch) | |
| tree | 5f107d42cb30a4b47ed30d356f39d1020e1f9b02 | |
| parent | dbf89a9b94b1ad813370577388b5ac692499a51f (diff) | |
Constify i2t_ASN1_OBJECT, i2d_ASN1_OBJECT, i2a_ASN1_OBJECT.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1300)
| -rw-r--r-- | crypto/asn1/a_object.c | 6 | ||||
| -rw-r--r-- | doc/crypto/OBJ_nid2obj.pod | 2 | ||||
| -rw-r--r-- | include/openssl/asn1.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 4cca7a09e3..463469d188 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -17,7 +17,7 @@ #include "internal/asn1_int.h" #include "asn1_locl.h" -int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp) +int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) { unsigned char *p; int objsize; @@ -161,12 +161,12 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num) return (0); } -int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a) +int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a) { return OBJ_obj2txt(buf, buf_len, a, 0); } -int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a) +int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a) { char buf[80], *p = buf; int i; diff --git a/doc/crypto/OBJ_nid2obj.pod b/doc/crypto/OBJ_nid2obj.pod index 02e81bad34..3ada6679cf 100644 --- a/doc/crypto/OBJ_nid2obj.pod +++ b/doc/crypto/OBJ_nid2obj.pod @@ -25,7 +25,7 @@ OBJ_dup, OBJ_txt2obj, OBJ_obj2txt, OBJ_create, OBJ_cleanup ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name); int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name); - int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a); + int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a); int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b); ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o); diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 03fc21e7d5..3655bf5c60 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -526,7 +526,7 @@ void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t); ASN1_OBJECT *ASN1_OBJECT_new(void); void ASN1_OBJECT_free(ASN1_OBJECT *a); -int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp); +int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp); ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long length); @@ -632,10 +632,10 @@ int i2a_ASN1_INTEGER(BIO *bp, 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 a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size); -int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a); +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 i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a); +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); ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len, |