diff options
| author | tb <> | 2018-05-19 10:41:53 +0000 |
|---|---|---|
| committer | tb <> | 2018-05-19 10:41:53 +0000 |
| commit | 95f086da4b90ddd2f5819b788f4ede851c704f19 (patch) | |
| tree | cdb017ea743db350d207f2cea95f61b68776273f /src | |
| parent | ebcd9413cf5a196f715422cc604ef2765ab8ecc2 (diff) | |
| download | openbsd-95f086da4b90ddd2f5819b788f4ede851c704f19.tar.gz openbsd-95f086da4b90ddd2f5819b788f4ede851c704f19.tar.bz2 openbsd-95f086da4b90ddd2f5819b788f4ede851c704f19.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.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_prn.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509v3/x509v3.h | 8 |
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 | ||
| 229 | void * | 229 | void * |
| 230 | X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx) | 230 | X509V3_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 | ||
| 154 | int | 154 | int |
| 155 | X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts, | 155 | X509V3_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); | |||
| 761 | int X509V3_add_standard_extensions(void); | 761 | int X509V3_add_standard_extensions(void); |
| 762 | STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line); | 762 | STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line); |
| 763 | void *X509V3_EXT_d2i(X509_EXTENSION *ext); | 763 | void *X509V3_EXT_d2i(X509_EXTENSION *ext); |
| 764 | void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx); | 764 | void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit, |
| 765 | int *idx); | ||
| 765 | 766 | ||
| 766 | 767 | ||
| 767 | X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc); | 768 | X509_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, | |||
| 776 | int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent); | 777 | int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent); |
| 777 | int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); | 778 | int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); |
| 778 | 779 | ||
| 779 | int X509V3_extensions_print(BIO *out, char *title, STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent); | 780 | int X509V3_extensions_print(BIO *out, const char *title, |
| 781 | const STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent); | ||
| 780 | 782 | ||
| 781 | int X509_check_ca(X509 *x); | 783 | int X509_check_ca(X509 *x); |
| 782 | int X509_check_purpose(X509 *x, int id, int ca); | 784 | int X509_check_purpose(X509 *x, int id, int ca); |
