diff options
author | tb <> | 2018-05-13 10:28:04 +0000 |
---|---|---|
committer | tb <> | 2018-05-13 10:28:04 +0000 |
commit | c56a8f621decfc65e51df9adeaf6e47ecc3b3779 (patch) | |
tree | 9f3ff2634354d9e3a0293498a58f09f4d1749f53 | |
parent | 5a08ef9f8f680e09cfb2655898a8aa7e6077b03a (diff) | |
download | openbsd-c56a8f621decfc65e51df9adeaf6e47ecc3b3779.tar.gz openbsd-c56a8f621decfc65e51df9adeaf6e47ecc3b3779.tar.bz2 openbsd-c56a8f621decfc65e51df9adeaf6e47ecc3b3779.zip |
Add const qualifier to the ASN1_OBJECT * argument of:
OCSP_REQUEST_get_ext_by_OBJ(3), OCSP_ONEREQ_ext_by_OBJ(3)
OCSP_BASICRESP_get_ext_by_OBJ(3), OCSP_SINGLERESP_get_ext_by_OBJ(3)
tested in a bulk build by sthen
ok jsing (as part of a larger diff)
-rw-r--r-- | src/lib/libcrypto/ocsp/ocsp.h | 12 | ||||
-rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_ext.c | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h index b2c4367f83..397e07aec6 100644 --- a/src/lib/libcrypto/ocsp/ocsp.h +++ b/src/lib/libcrypto/ocsp/ocsp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ocsp.h,v 1.12 2018/03/17 14:44:34 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp.h,v 1.13 2018/05/13 10:28:04 tb Exp $ */ |
2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL | 2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL |
3 | * project. */ | 3 | * project. */ |
4 | 4 | ||
@@ -459,7 +459,7 @@ X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls); | |||
459 | 459 | ||
460 | int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x); | 460 | int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x); |
461 | int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos); | 461 | int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos); |
462 | int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, | 462 | int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj, |
463 | int lastpos); | 463 | int lastpos); |
464 | int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, | 464 | int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, |
465 | int lastpos); | 465 | int lastpos); |
@@ -472,7 +472,7 @@ int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc); | |||
472 | 472 | ||
473 | int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x); | 473 | int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x); |
474 | int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos); | 474 | int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos); |
475 | int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, | 475 | int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj, |
476 | int lastpos); | 476 | int lastpos); |
477 | int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos); | 477 | int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos); |
478 | X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc); | 478 | X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc); |
@@ -484,7 +484,7 @@ int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc); | |||
484 | 484 | ||
485 | int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x); | 485 | int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x); |
486 | int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos); | 486 | int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos); |
487 | int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, | 487 | int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj, |
488 | int lastpos); | 488 | int lastpos); |
489 | int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, | 489 | int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, |
490 | int lastpos); | 490 | int lastpos); |
@@ -499,8 +499,8 @@ int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc); | |||
499 | int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x); | 499 | int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x); |
500 | int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, | 500 | int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, |
501 | int lastpos); | 501 | int lastpos); |
502 | int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, | 502 | int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, |
503 | int lastpos); | 503 | const ASN1_OBJECT *obj, int lastpos); |
504 | int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, | 504 | int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, |
505 | int lastpos); | 505 | int lastpos); |
506 | X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc); | 506 | X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc); |
diff --git a/src/lib/libcrypto/ocsp/ocsp_ext.c b/src/lib/libcrypto/ocsp/ocsp_ext.c index 1f2563ca8a..16cd70cad6 100644 --- a/src/lib/libcrypto/ocsp/ocsp_ext.c +++ b/src/lib/libcrypto/ocsp/ocsp_ext.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ocsp_ext.c,v 1.15 2016/12/27 16:01:19 jsing Exp $ */ | 1 | /* $OpenBSD: ocsp_ext.c,v 1.16 2018/05/13 10:28:04 tb Exp $ */ |
2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL | 2 | /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL |
3 | * project. */ | 3 | * project. */ |
4 | 4 | ||
@@ -88,7 +88,7 @@ OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | int | 90 | int |
91 | OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, int lastpos) | 91 | OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj, int lastpos) |
92 | { | 92 | { |
93 | return X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions, obj, | 93 | return X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions, obj, |
94 | lastpos); | 94 | lastpos); |
@@ -149,7 +149,7 @@ OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos) | |||
149 | } | 149 | } |
150 | 150 | ||
151 | int | 151 | int |
152 | OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos) | 152 | OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj, int lastpos) |
153 | { | 153 | { |
154 | return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos); | 154 | return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos); |
155 | } | 155 | } |
@@ -209,7 +209,8 @@ OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | int | 211 | int |
212 | OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, int lastpos) | 212 | OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj, |
213 | int lastpos) | ||
213 | { | 214 | { |
214 | return X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions, | 215 | return X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions, |
215 | obj, lastpos); | 216 | obj, lastpos); |
@@ -271,7 +272,7 @@ OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos) | |||
271 | } | 272 | } |
272 | 273 | ||
273 | int | 274 | int |
274 | OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, | 275 | OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj, |
275 | int lastpos) | 276 | int lastpos) |
276 | { | 277 | { |
277 | return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos); | 278 | return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos); |