summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-05-13 10:28:04 +0000
committertb <>2018-05-13 10:28:04 +0000
commitc56a8f621decfc65e51df9adeaf6e47ecc3b3779 (patch)
tree9f3ff2634354d9e3a0293498a58f09f4d1749f53
parent5a08ef9f8f680e09cfb2655898a8aa7e6077b03a (diff)
downloadopenbsd-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.h12
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_ext.c11
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
460int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x); 460int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
461int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos); 461int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
462int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, 462int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
463 int lastpos); 463 int lastpos);
464int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, 464int 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
473int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x); 473int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
474int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos); 474int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos);
475int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, 475int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj,
476 int lastpos); 476 int lastpos);
477int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos); 477int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos);
478X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc); 478X509_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
485int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x); 485int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
486int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos); 486int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
487int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, 487int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
488 int lastpos); 488 int lastpos);
489int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, 489int 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);
499int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x); 499int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
500int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, 500int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid,
501 int lastpos); 501 int lastpos);
502int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, 502int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x,
503 int lastpos); 503 const ASN1_OBJECT *obj, int lastpos);
504int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, 504int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
505 int lastpos); 505 int lastpos);
506X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc); 506X509_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
90int 90int
91OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, int lastpos) 91OCSP_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
151int 151int
152OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos) 152OCSP_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
211int 211int
212OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, int lastpos) 212OCSP_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
273int 274int
274OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, 275OCSP_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);