summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ts/ts.h10
-rw-r--r--src/lib/libcrypto/ts/ts_req_utils.c6
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_sign.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libcrypto/ts/ts.h b/src/lib/libcrypto/ts/ts.h
index a8d2281b7a..3a010d517b 100644
--- a/src/lib/libcrypto/ts/ts.h
+++ b/src/lib/libcrypto/ts/ts.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts.h,v 1.8 2016/12/27 16:05:57 jsing Exp $ */ 1/* $OpenBSD: ts.h,v 1.9 2018/05/13 15:04:05 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL
3 * project 2002, 2003, 2004. 3 * project 2002, 2003, 2004.
4 */ 4 */
@@ -365,7 +365,7 @@ X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a);
365int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len); 365int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len);
366ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a); 366ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
367 367
368int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy); 368int TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy);
369ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a); 369ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
370 370
371int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce); 371int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
@@ -378,7 +378,7 @@ STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
378void TS_REQ_ext_free(TS_REQ *a); 378void TS_REQ_ext_free(TS_REQ *a);
379int TS_REQ_get_ext_count(TS_REQ *a); 379int TS_REQ_get_ext_count(TS_REQ *a);
380int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos); 380int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos);
381int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos); 381int TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos);
382int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos); 382int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos);
383X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc); 383X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc);
384X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc); 384X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc);
@@ -524,14 +524,14 @@ int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
524int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key); 524int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
525 525
526/* This parameter must be set. */ 526/* This parameter must be set. */
527int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy); 527int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy);
528 528
529/* No additional certs are included in the response by default. */ 529/* No additional certs are included in the response by default. */
530int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs); 530int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs);
531 531
532/* Adds a new acceptable policy, only the default policy 532/* Adds a new acceptable policy, only the default policy
533 is accepted by default. */ 533 is accepted by default. */
534int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy); 534int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy);
535 535
536/* Adds a new acceptable message digest. Note that no message digests 536/* Adds a new acceptable message digest. Note that no message digests
537 are accepted by default. The md argument is shared with the caller. */ 537 are accepted by default. The md argument is shared with the caller. */
diff --git a/src/lib/libcrypto/ts/ts_req_utils.c b/src/lib/libcrypto/ts/ts_req_utils.c
index bd707c228f..6b9c13f39b 100644
--- a/src/lib/libcrypto/ts/ts_req_utils.c
+++ b/src/lib/libcrypto/ts/ts_req_utils.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_req_utils.c,v 1.5 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: ts_req_utils.c,v 1.6 2018/05/13 15:04:05 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -134,7 +134,7 @@ TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a)
134} 134}
135 135
136int 136int
137TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy) 137TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy)
138{ 138{
139 ASN1_OBJECT *new_policy; 139 ASN1_OBJECT *new_policy;
140 140
@@ -219,7 +219,7 @@ TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos)
219} 219}
220 220
221int 221int
222TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos) 222TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos)
223{ 223{
224 return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos); 224 return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
225} 225}
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 57e2d7f348..9ab80160b3 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_rsp_sign.c,v 1.21 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: ts_rsp_sign.c,v 1.22 2018/05/13 15:04:05 tb Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -201,7 +201,7 @@ TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key)
201} 201}
202 202
203int 203int
204TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy) 204TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy)
205{ 205{
206 if (ctx->default_policy) 206 if (ctx->default_policy)
207 ASN1_OBJECT_free(ctx->default_policy); 207 ASN1_OBJECT_free(ctx->default_policy);
@@ -238,7 +238,7 @@ TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs)
238} 238}
239 239
240int 240int
241TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy) 241TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy)
242{ 242{
243 ASN1_OBJECT *copy = NULL; 243 ASN1_OBJECT *copy = NULL;
244 244