diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-08-19 19:44:10 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-23 11:47:22 +0200 |
| commit | 0fe9123687096b6ec7c3c4337095c6e4a94e9867 (patch) | |
| tree | 546bb45ed03bc09a8585977c2af4209b167eaf8b | |
| parent | 9f5466b9b86607bb62239873e6be2de1fe9f71fb (diff) | |
| download | openssl-0fe9123687096b6ec7c3c4337095c6e4a94e9867.tar.gz | |
Constify a bit X509_NAME_get_entry
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/asn1/a_strex.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509name.c | 2 | ||||
| -rw-r--r-- | doc/crypto/X509_NAME_get_index_by_NID.pod | 2 | ||||
| -rw-r--r-- | include/openssl/x509.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index fc9883be2b..9839f5c76e 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -455,9 +455,9 @@ static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n, cnt = X509_NAME_entry_count(n); for (i = 0; i < cnt; i++) { if (flags & XN_FLAG_DN_REV) - ent = X509_NAME_get_entry((X509_NAME *)n, cnt - i - 1); + ent = X509_NAME_get_entry(n, cnt - i - 1); else - ent = X509_NAME_get_entry((X509_NAME *)n, i); + ent = X509_NAME_get_entry(n, i); if (prev != -1) { if (prev == X509_NAME_ENTRY_set(ent)) { if (!io_ch(arg, sep_mv, sep_mv_len)) diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c index ae39c75e58..919d8c1e7f 100644 --- a/crypto/x509/x509name.c +++ b/crypto/x509/x509name.c @@ -82,7 +82,7 @@ int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int last return (-1); } -X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc) +X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc) { if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc || loc < 0) diff --git a/doc/crypto/X509_NAME_get_index_by_NID.pod b/doc/crypto/X509_NAME_get_index_by_NID.pod index 9b367394cd..042da24697 100644 --- a/doc/crypto/X509_NAME_get_index_by_NID.pod +++ b/doc/crypto/X509_NAME_get_index_by_NID.pod @@ -14,7 +14,7 @@ X509_NAME lookup and enumeration functions int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int lastpos); int X509_NAME_entry_count(const X509_NAME *name); - X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); + X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc); int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len); int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, int len); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 3e45ec023f..c8996f3520 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -790,7 +790,7 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos); int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int lastpos); -X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); +X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc); X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc); int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc, int set); |