summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2018-05-18 18:30:03 +0000
committertb <>2018-05-18 18:30:03 +0000
commitfeaa93ff6ceca73b2feaca0b7de02f4ddc2e7b0d (patch)
tree90c6cf234d0bdffd62bca08dd2a5a40b63b6b1cc /src/lib
parentd180944018d8d319ba290f2f92f863d5ce1e81a1 (diff)
downloadopenbsd-feaa93ff6ceca73b2feaca0b7de02f4ddc2e7b0d.tar.gz
openbsd-feaa93ff6ceca73b2feaca0b7de02f4ddc2e7b0d.tar.bz2
openbsd-feaa93ff6ceca73b2feaca0b7de02f4ddc2e7b0d.zip
Add const qualifiers to the 'name', 'sname' and 'X509_PURPOSE *'
arguments of X509_PURPOSE_add(3), X509_PURPOSE_get0_name(3), X509_PURPOSE_get0_sname(3), X509_PURPOSE_get_by_sname(3), X509_PURPOSE_get_id(3), X509_PURPOSE_get_trust(3). tested in a bulk build by sthen ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509v3/v3_purp.c16
-rw-r--r--src/lib/libcrypto/x509v3/x509v3.h14
2 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c
index d692a19c25..0fdec224a3 100644
--- a/src/lib/libcrypto/x509v3/v3_purp.c
+++ b/src/lib/libcrypto/x509v3/v3_purp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_purp.c,v 1.30 2017/06/22 17:28:00 jsing Exp $ */ 1/* $OpenBSD: v3_purp.c,v 1.31 2018/05/18 18:30:03 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -172,7 +172,7 @@ X509_PURPOSE_get0(int idx)
172} 172}
173 173
174int 174int
175X509_PURPOSE_get_by_sname(char *sname) 175X509_PURPOSE_get_by_sname(const char *sname)
176{ 176{
177 int i; 177 int i;
178 X509_PURPOSE *xptmp; 178 X509_PURPOSE *xptmp;
@@ -204,8 +204,8 @@ X509_PURPOSE_get_by_id(int purpose)
204 204
205int 205int
206X509_PURPOSE_add(int id, int trust, int flags, 206X509_PURPOSE_add(int id, int trust, int flags,
207 int (*ck)(const X509_PURPOSE *, const X509 *, int), char *name, 207 int (*ck)(const X509_PURPOSE *, const X509 *, int), const char *name,
208 char *sname, void *arg) 208 const char *sname, void *arg)
209{ 209{
210 int idx; 210 int idx;
211 X509_PURPOSE *ptmp; 211 X509_PURPOSE *ptmp;
@@ -302,25 +302,25 @@ X509_PURPOSE_cleanup(void)
302} 302}
303 303
304int 304int
305X509_PURPOSE_get_id(X509_PURPOSE *xp) 305X509_PURPOSE_get_id(const X509_PURPOSE *xp)
306{ 306{
307 return xp->purpose; 307 return xp->purpose;
308} 308}
309 309
310char * 310char *
311X509_PURPOSE_get0_name(X509_PURPOSE *xp) 311X509_PURPOSE_get0_name(const X509_PURPOSE *xp)
312{ 312{
313 return xp->name; 313 return xp->name;
314} 314}
315 315
316char * 316char *
317X509_PURPOSE_get0_sname(X509_PURPOSE *xp) 317X509_PURPOSE_get0_sname(const X509_PURPOSE *xp)
318{ 318{
319 return xp->sname; 319 return xp->sname;
320} 320}
321 321
322int 322int
323X509_PURPOSE_get_trust(X509_PURPOSE *xp) 323X509_PURPOSE_get_trust(const X509_PURPOSE *xp)
324{ 324{
325 return xp->trust; 325 return xp->trust;
326} 326}
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h
index 429239424c..0d636d7bf4 100644
--- a/src/lib/libcrypto/x509v3/x509v3.h
+++ b/src/lib/libcrypto/x509v3/x509v3.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509v3.h,v 1.25 2018/05/13 17:49:03 tb Exp $ */ 1/* $OpenBSD: x509v3.h,v 1.26 2018/05/18 18:30:03 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -782,16 +782,16 @@ int X509_check_issued(X509 *issuer, X509 *subject);
782int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid); 782int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
783int X509_PURPOSE_get_count(void); 783int X509_PURPOSE_get_count(void);
784X509_PURPOSE * X509_PURPOSE_get0(int idx); 784X509_PURPOSE * X509_PURPOSE_get0(int idx);
785int X509_PURPOSE_get_by_sname(char *sname); 785int X509_PURPOSE_get_by_sname(const char *sname);
786int X509_PURPOSE_get_by_id(int id); 786int X509_PURPOSE_get_by_id(int id);
787int X509_PURPOSE_add(int id, int trust, int flags, 787int X509_PURPOSE_add(int id, int trust, int flags,
788 int (*ck)(const X509_PURPOSE *, const X509 *, int), 788 int (*ck)(const X509_PURPOSE *, const X509 *, int),
789 char *name, char *sname, void *arg); 789 const char *name, const char *sname, void *arg);
790char *X509_PURPOSE_get0_name(X509_PURPOSE *xp); 790char *X509_PURPOSE_get0_name(const X509_PURPOSE *xp);
791char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp); 791char *X509_PURPOSE_get0_sname(const X509_PURPOSE *xp);
792int X509_PURPOSE_get_trust(X509_PURPOSE *xp); 792int X509_PURPOSE_get_trust(const X509_PURPOSE *xp);
793void X509_PURPOSE_cleanup(void); 793void X509_PURPOSE_cleanup(void);
794int X509_PURPOSE_get_id(X509_PURPOSE *); 794int X509_PURPOSE_get_id(const X509_PURPOSE *);
795 795
796STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x); 796STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
797STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x); 797STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);