diff options
author | tb <> | 2018-05-18 18:12:08 +0000 |
---|---|---|
committer | tb <> | 2018-05-18 18:12:08 +0000 |
commit | abe060d69f2238cabaee4c76b3f9344172c85766 (patch) | |
tree | 0e08dd6e669653d90d09737f8ed56fd16d2b676d /src/lib | |
parent | c24a1915da522843c7d987ef000d91d7288b1dbf (diff) | |
download | openbsd-abe060d69f2238cabaee4c76b3f9344172c85766.tar.gz openbsd-abe060d69f2238cabaee4c76b3f9344172c85766.tar.bz2 openbsd-abe060d69f2238cabaee4c76b3f9344172c85766.zip |
Add a const qualififer to the 'name' argument of X509_NAME_get_entry(3)
and to the 'obj' argument of X509_NAME_get_index_by_OBJ(3)
tested in a bulk build by sthen
ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509name.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 35a0219c15..85270b1b65 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.56 2018/05/18 18:05:57 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.57 2018/05/18 18:12:08 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1099,9 +1099,9 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, | |||
1099 | /* NOTE: you should be passsing -1, not 0 as lastpos. The functions that use | 1099 | /* NOTE: you should be passsing -1, not 0 as lastpos. The functions that use |
1100 | * lastpos, search after that position on. */ | 1100 | * lastpos, search after that position on. */ |
1101 | int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos); | 1101 | int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos); |
1102 | int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, | 1102 | int X509_NAME_get_index_by_OBJ(X509_NAME *name, |
1103 | int lastpos); | 1103 | const ASN1_OBJECT *obj, int lastpos); |
1104 | X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); | 1104 | X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc); |
1105 | X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc); | 1105 | X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc); |
1106 | int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, | 1106 | int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, |
1107 | int loc, int set); | 1107 | int loc, int set); |
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c index db7b5ce8c0..b62b883de2 100644 --- a/src/lib/libcrypto/x509/x509name.c +++ b/src/lib/libcrypto/x509/x509name.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509name.c,v 1.22 2018/05/18 18:05:57 tb Exp $ */ | 1 | /* $OpenBSD: x509name.c,v 1.23 2018/05/18 18:12:08 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -119,7 +119,7 @@ X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos) | |||
119 | 119 | ||
120 | /* NOTE: you should be passsing -1, not 0 as lastpos */ | 120 | /* NOTE: you should be passsing -1, not 0 as lastpos */ |
121 | int | 121 | int |
122 | X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos) | 122 | X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int lastpos) |
123 | { | 123 | { |
124 | int n; | 124 | int n; |
125 | X509_NAME_ENTRY *ne; | 125 | X509_NAME_ENTRY *ne; |
@@ -140,7 +140,7 @@ X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos) | |||
140 | } | 140 | } |
141 | 141 | ||
142 | X509_NAME_ENTRY * | 142 | X509_NAME_ENTRY * |
143 | X509_NAME_get_entry(X509_NAME *name, int loc) | 143 | X509_NAME_get_entry(const X509_NAME *name, int loc) |
144 | { | 144 | { |
145 | if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc || | 145 | if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc || |
146 | loc < 0) | 146 | loc < 0) |