summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2018-05-19 10:41:53 +0000
committertb <>2018-05-19 10:41:53 +0000
commit0a5fa0185a9762195b939da5ca2d02ec60c01f7d (patch)
treecdb017ea743db350d207f2cea95f61b68776273f /src
parent1e92ef5d4e261f540f7f155e7edf5fe8a68cf59e (diff)
downloadopenbsd-0a5fa0185a9762195b939da5ca2d02ec60c01f7d.tar.gz
openbsd-0a5fa0185a9762195b939da5ca2d02ec60c01f7d.tar.bz2
openbsd-0a5fa0185a9762195b939da5ca2d02ec60c01f7d.zip
Add a const qualifier to the STACK_OF(X509_EXTENSION) * arguments of
X509V3_get_d2i() and X509V3_extensions_print(), and one to the 'title' argument of the latter function. tested in a bulk build by sthen ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509v3/v3_lib.c4
-rw-r--r--src/lib/libcrypto/x509v3/v3_prn.c6
-rw-r--r--src/lib/libcrypto/x509v3/x509v3.h8
3 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c
index f0cc93bda6..94f3e4b753 100644
--- a/src/lib/libcrypto/x509v3/v3_lib.c
+++ b/src/lib/libcrypto/x509v3/v3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_lib.c,v 1.17 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: v3_lib.c,v 1.18 2018/05/19 10:41:53 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 */
@@ -227,7 +227,7 @@ X509V3_EXT_d2i(X509_EXTENSION *ext)
227 */ 227 */
228 228
229void * 229void *
230X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx) 230X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
231{ 231{
232 int lastpos, i; 232 int lastpos, i;
233 X509_EXTENSION *ex, *found_ex = NULL; 233 X509_EXTENSION *ex, *found_ex = NULL;
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index f65c7aaa8a..f294c36b3e 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_prn.c,v 1.19 2016/12/30 15:54:49 jsing Exp $ */ 1/* $OpenBSD: v3_prn.c,v 1.20 2018/05/19 10:41:53 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 */
@@ -152,8 +152,8 @@ err:
152} 152}
153 153
154int 154int
155X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts, 155X509V3_extensions_print(BIO *bp, const char *title,
156 unsigned long flag, int indent) 156 const STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent)
157{ 157{
158 int i, j; 158 int i, j;
159 159
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h
index 34b3dd9e89..a41250bf5c 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.28 2018/05/19 10:37:02 tb Exp $ */ 1/* $OpenBSD: x509v3.h,v 1.29 2018/05/19 10:41:53 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 */
@@ -761,7 +761,8 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
761int X509V3_add_standard_extensions(void); 761int X509V3_add_standard_extensions(void);
762STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line); 762STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
763void *X509V3_EXT_d2i(X509_EXTENSION *ext); 763void *X509V3_EXT_d2i(X509_EXTENSION *ext);
764void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx); 764void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
765 int *idx);
765 766
766 767
767X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc); 768X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
@@ -776,7 +777,8 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
776int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent); 777int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent);
777int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); 778int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
778 779
779int X509V3_extensions_print(BIO *out, char *title, STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent); 780int X509V3_extensions_print(BIO *out, const char *title,
781 const STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent);
780 782
781int X509_check_ca(X509 *x); 783int X509_check_ca(X509 *x);
782int X509_check_purpose(X509 *x, int id, int ca); 784int X509_check_purpose(X509 *x, int id, int ca);