From abe060d69f2238cabaee4c76b3f9344172c85766 Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 18 May 2018 18:12:08 +0000 Subject: 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 --- src/lib/libcrypto/x509/x509.h | 8 ++++---- src/lib/libcrypto/x509/x509name.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib') 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 @@ -/* $OpenBSD: x509.h,v 1.56 2018/05/18 18:05:57 tb Exp $ */ +/* $OpenBSD: x509.h,v 1.57 2018/05/18 18:12:08 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1099,9 +1099,9 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, /* NOTE: you should be passsing -1, not 0 as lastpos. The functions that use * lastpos, search after that position on. */ int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos); -int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, - int lastpos); -X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc); +int X509_NAME_get_index_by_OBJ(X509_NAME *name, + const ASN1_OBJECT *obj, int lastpos); +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); 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 @@ -/* $OpenBSD: x509name.c,v 1.22 2018/05/18 18:05:57 tb Exp $ */ +/* $OpenBSD: x509name.c,v 1.23 2018/05/18 18:12:08 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -119,7 +119,7 @@ X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos) /* NOTE: you should be passsing -1, not 0 as lastpos */ int -X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos) +X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int lastpos) { int n; X509_NAME_ENTRY *ne; @@ -140,7 +140,7 @@ X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int lastpos) } X509_NAME_ENTRY * -X509_NAME_get_entry(X509_NAME *name, int loc) +X509_NAME_get_entry(const X509_NAME *name, int loc) { if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc || loc < 0) -- cgit v1.2.3-55-g6feb