From 6c73d01142fa8eb450a16f1f2e81ae2a2681c109 Mon Sep 17 00:00:00 2001 From: Nils Larsch Date: Sun, 5 Mar 2006 20:19:05 +0000 Subject: [PATCH] constify some print and ts functions --- crypto/asn1/asn1.h | 8 +++---- crypto/asn1/t_x509.c | 17 ++++++++------- crypto/ts/ts.h | 44 +++++++++++++++++++-------------------- crypto/ts/ts_lib.c | 10 ++++----- crypto/ts/ts_req_print.c | 2 +- crypto/ts/ts_req_utils.c | 8 +++---- crypto/ts/ts_rsp_print.c | 16 +++++++------- crypto/ts/ts_rsp_sign.c | 4 ++-- crypto/ts/ts_rsp_utils.c | 28 ++++++++++++------------- crypto/ts/ts_rsp_verify.c | 6 +++--- crypto/ts/ts_verify_ctx.c | 2 +- 11 files changed, 73 insertions(+), 72 deletions(-) diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 9f6e1b99b3..24fa4362c3 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -940,10 +940,10 @@ int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x); #define ASN1_i2d_bio_of_const(type,i2d,out,x) \ ((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x) int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x); -int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a); -int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a); -int ASN1_TIME_print(BIO *fp,ASN1_TIME *a); -int ASN1_STRING_print(BIO *bp,ASN1_STRING *v); +int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a); +int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a); +int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a); +int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v); int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags); int ASN1_parse(BIO *bp,const unsigned char *pp,long len,int indent); int ASN1_parse_dump(BIO *bp,const unsigned char *pp,long len,int indent,int dump); diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index 3d25335e54..7256866eda 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -329,14 +329,15 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig) return 1; } -int ASN1_STRING_print(BIO *bp, ASN1_STRING *v) +int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v) { int i,n; - char buf[80],*p;; + char buf[80]; + const char *p; if (v == NULL) return(0); n=0; - p=(char *)v->data; + p=(const char *)v->data; for (i=0; ilength; i++) { if ((p[i] > '~') || ((p[i] < ' ') && @@ -358,7 +359,7 @@ int ASN1_STRING_print(BIO *bp, ASN1_STRING *v) return(1); } -int ASN1_TIME_print(BIO *bp, ASN1_TIME *tm) +int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm) { if(tm->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_print(bp, tm); if(tm->type == V_ASN1_GENERALIZEDTIME) @@ -373,7 +374,7 @@ static const char *mon[12]= "Jul","Aug","Sep","Oct","Nov","Dec" }; -int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm) +int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm) { char *v; int gmt=0; @@ -420,15 +421,15 @@ err: return(0); } -int ASN1_UTCTIME_print(BIO *bp, ASN1_UTCTIME *tm) +int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm) { - char *v; + const char *v; int gmt=0; int i; int y=0,M=0,d=0,h=0,m=0,s=0; i=tm->length; - v=(char *)tm->data; + v=(const char *)tm->data; if (i < 10) goto err; if (v[i-1] == 'Z') gmt=1; diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h index befdf4191d..d080f98ea9 100644 --- a/crypto/ts/ts.h +++ b/crypto/ts/ts.h @@ -372,7 +372,7 @@ ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a); void ERR_load_TS_strings(void); int TS_REQ_set_version(TS_REQ *a, long version); -long TS_REQ_get_version(TS_REQ *a); +long TS_REQ_get_version(const TS_REQ *a); int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint); TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a); @@ -386,11 +386,11 @@ ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a); int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy); ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a); -int TS_REQ_set_nonce(TS_REQ *a, ASN1_INTEGER *nonce); -ASN1_INTEGER *TS_REQ_get_nonce(TS_REQ *a); +int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce); +const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a); int TS_REQ_set_cert_req(TS_REQ *a, int cert_req); -int TS_REQ_get_cert_req(TS_REQ *a); +int TS_REQ_get_cert_req(const TS_REQ *a); STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a); void TS_REQ_ext_free(TS_REQ *a); @@ -418,7 +418,7 @@ PKCS7 *TS_RESP_get_token(TS_RESP *a); TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a); int TS_TST_INFO_set_version(TS_TST_INFO *a, long version); -long TS_TST_INFO_get_version(TS_TST_INFO *a); +long TS_TST_INFO_get_version(const TS_TST_INFO *a); int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id); ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a); @@ -426,29 +426,29 @@ ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a); int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint); TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a); -int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial); -ASN1_INTEGER *TS_TST_INFO_get_serial(TS_TST_INFO *a); +int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial); +const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a); -int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime); -ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(TS_TST_INFO *a); +int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime); +const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a); int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy); TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a); -int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds); -ASN1_INTEGER *TS_ACCURACY_get_seconds(TS_ACCURACY *a); +int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds); +const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a); -int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis); -ASN1_INTEGER *TS_ACCURACY_get_millis(TS_ACCURACY *a); +int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis); +const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a); -int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros); -ASN1_INTEGER *TS_ACCURACY_get_micros(TS_ACCURACY *a); +int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros); +const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a); int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering); -int TS_TST_INFO_get_ordering(TS_TST_INFO *a); +int TS_TST_INFO_get_ordering(const TS_TST_INFO *a); -int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce); -ASN1_INTEGER *TS_TST_INFO_get_nonce(TS_TST_INFO *a); +int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce); +const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a); int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa); GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a); @@ -719,10 +719,10 @@ int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a); /* Common utility functions defined in ts/ts_lib.c */ -int TS_ASN1_INTEGER_print_bio(BIO *bio, ASN1_INTEGER *num); -int TS_OBJ_print_bio(BIO *bio, ASN1_OBJECT *obj); -int TS_ext_print_bio(BIO *bio, STACK_OF(X509_EXTENSION) *extensions); -int TS_X509_ALGOR_print_bio(BIO *bio, X509_ALGOR *alg); +int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num); +int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj); +int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions); +int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg); int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg); /* Function declarations for handling configuration options, diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c index a2ef4a4d9a..e8608dbf71 100644 --- a/crypto/ts/ts_lib.c +++ b/crypto/ts/ts_lib.c @@ -67,7 +67,7 @@ /* Function definitions. */ -int TS_ASN1_INTEGER_print_bio(BIO *bio, ASN1_INTEGER *num) +int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num) { BIGNUM num_bn; int result = 0; @@ -86,7 +86,7 @@ int TS_ASN1_INTEGER_print_bio(BIO *bio, ASN1_INTEGER *num) return result; } -int TS_OBJ_print_bio(BIO *bio, ASN1_OBJECT *obj) +int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) { char obj_txt[128]; @@ -97,7 +97,7 @@ int TS_OBJ_print_bio(BIO *bio, ASN1_OBJECT *obj) return 1; } -int TS_ext_print_bio(BIO *bio, STACK_OF(X509_EXTENSION) *extensions) +int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) { int i, critical, n; X509_EXTENSION *ex; @@ -123,7 +123,7 @@ int TS_ext_print_bio(BIO *bio, STACK_OF(X509_EXTENSION) *extensions) return 1; } -int TS_X509_ALGOR_print_bio(BIO *bio, X509_ALGOR *alg) +int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg) { int i = OBJ_obj2nid(alg->algorithm); return BIO_printf(bio, "Hash Algorithm: %s\n", @@ -132,7 +132,7 @@ int TS_X509_ALGOR_print_bio(BIO *bio, X509_ALGOR *alg) int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) { - ASN1_OCTET_STRING *msg; + const ASN1_OCTET_STRING *msg; TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a)); diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c index 8827f20d65..eba12c3824 100644 --- a/crypto/ts/ts_req_print.c +++ b/crypto/ts/ts_req_print.c @@ -69,7 +69,7 @@ int TS_REQ_print_bio(BIO *bio, TS_REQ *a) { int v; ASN1_OBJECT *policy_id; - ASN1_INTEGER *nonce; + const ASN1_INTEGER *nonce; if (a == NULL) return 0; diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c index bf2ddfbd30..43280c1587 100644 --- a/crypto/ts/ts_req_utils.c +++ b/crypto/ts/ts_req_utils.c @@ -67,7 +67,7 @@ int TS_REQ_set_version(TS_REQ *a, long version) return ASN1_INTEGER_set(a->version, version); } -long TS_REQ_get_version(TS_REQ *a) +long TS_REQ_get_version(const TS_REQ *a) { return ASN1_INTEGER_get(a->version); } @@ -148,7 +148,7 @@ ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a) return a->policy_id; } -int TS_REQ_set_nonce(TS_REQ *a, ASN1_INTEGER *nonce) +int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce) { ASN1_INTEGER *new_nonce; @@ -165,7 +165,7 @@ int TS_REQ_set_nonce(TS_REQ *a, ASN1_INTEGER *nonce) return 1; } -ASN1_INTEGER *TS_REQ_get_nonce(TS_REQ *a) +const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a) { return a->nonce; } @@ -176,7 +176,7 @@ int TS_REQ_set_cert_req(TS_REQ *a, int cert_req) return 1; } -int TS_REQ_get_cert_req(TS_REQ *a) +int TS_REQ_get_cert_req(const TS_REQ *a) { return a->cert_req ? 1 : 0; } diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c index 6421315e41..21062517ba 100644 --- a/crypto/ts/ts_rsp_print.c +++ b/crypto/ts/ts_rsp_print.c @@ -73,7 +73,7 @@ struct status_map_st static int TS_status_map_print(BIO *bio, struct status_map_st *a, ASN1_BIT_STRING *v); -static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy); +static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy); /* Function definitions. */ @@ -184,10 +184,10 @@ int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a) { int v; ASN1_OBJECT *policy_id; - ASN1_INTEGER *serial; - ASN1_GENERALIZEDTIME *gtime; + const ASN1_INTEGER *serial; + const ASN1_GENERALIZEDTIME *gtime; TS_ACCURACY *accuracy; - ASN1_INTEGER *nonce; + const ASN1_INTEGER *nonce; GENERAL_NAME *tsa_name; if (a == NULL) return 0; @@ -261,11 +261,11 @@ int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a) return 1; } -static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy) +static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy) { - ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy); - ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy); - ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy); + const ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy); + const ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy); + const ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy); if (seconds != NULL) TS_ASN1_INTEGER_print_bio(bio, seconds); diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index aa1b6370d9..30b6498456 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -512,7 +512,7 @@ static int TS_RESP_check_request(TS_RESP_CTX *ctx) TS_MSG_IMPRINT *msg_imprint; X509_ALGOR *md_alg; int md_alg_id; - ASN1_OCTET_STRING *digest; + const ASN1_OCTET_STRING *digest; EVP_MD *md = NULL; int i; @@ -607,7 +607,7 @@ static TS_TST_INFO *TS_RESP_create_tst_info(TS_RESP_CTX *ctx, ASN1_GENERALIZEDTIME *asn1_time = NULL; long sec, usec; TS_ACCURACY *accuracy = NULL; - ASN1_INTEGER *nonce; + const ASN1_INTEGER *nonce; GENERAL_NAME *tsa_name = NULL; if (!(tst_info = TS_TST_INFO_new())) goto end; diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c index 0c6c504a17..401c1fdc51 100644 --- a/crypto/ts/ts_rsp_utils.c +++ b/crypto/ts/ts_rsp_utils.c @@ -112,7 +112,7 @@ int TS_TST_INFO_set_version(TS_TST_INFO *a, long version) return ASN1_INTEGER_set(a->version, version); } -long TS_TST_INFO_get_version(TS_TST_INFO *a) +long TS_TST_INFO_get_version(const TS_TST_INFO *a) { return ASN1_INTEGER_get(a->version); } @@ -161,7 +161,7 @@ TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a) return a->msg_imprint; } -int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial) +int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial) { ASN1_INTEGER *new_serial; @@ -178,12 +178,12 @@ int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial) return 1; } -ASN1_INTEGER *TS_TST_INFO_get_serial(TS_TST_INFO *a) +const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a) { return a->serial; } -int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime) +int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime) { ASN1_GENERALIZEDTIME *new_time; @@ -200,7 +200,7 @@ int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime) return 1; } -ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(TS_TST_INFO *a) +const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a) { return a->time; } @@ -227,7 +227,7 @@ TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a) return a->accuracy; } -int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds) +int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds) { ASN1_INTEGER *new_seconds; @@ -244,12 +244,12 @@ int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds) return 1; } -ASN1_INTEGER *TS_ACCURACY_get_seconds(TS_ACCURACY *a) +const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a) { return a->seconds; } -int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis) +int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis) { ASN1_INTEGER *new_millis = NULL; @@ -270,12 +270,12 @@ int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis) return 1; } -ASN1_INTEGER *TS_ACCURACY_get_millis(TS_ACCURACY *a) +const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a) { return a->millis; } -int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros) +int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros) { ASN1_INTEGER *new_micros = NULL; @@ -296,7 +296,7 @@ int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros) return 1; } -ASN1_INTEGER *TS_ACCURACY_get_micros(TS_ACCURACY *a) +const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a) { return a->micros; } @@ -307,12 +307,12 @@ int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering) return 1; } -int TS_TST_INFO_get_ordering(TS_TST_INFO *a) +int TS_TST_INFO_get_ordering(const TS_TST_INFO *a) { return a->ordering ? 1 : 0; } -int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce) +int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce) { ASN1_INTEGER *new_nonce; @@ -329,7 +329,7 @@ int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce) return 1; } -ASN1_INTEGER *TS_TST_INFO_get_nonce(TS_TST_INFO *a) +const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a) { return a->nonce; } diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index 8b57513b94..dcc09bc16a 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -81,7 +81,7 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info, static int TS_check_imprints(X509_ALGOR *algor_a, unsigned char *imprint_a, unsigned len_a, TS_TST_INFO *tst_info); -static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info); +static int TS_check_nonces(const ASN1_INTEGER *a, TS_TST_INFO *tst_info); static int TS_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer); static int TS_find_name(STACK_OF(GENERAL_NAME) *gen_names, GENERAL_NAME *name); @@ -657,9 +657,9 @@ static int TS_check_imprints(X509_ALGOR *algor_a, return ret; } -static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info) +static int TS_check_nonces(const ASN1_INTEGER *a, TS_TST_INFO *tst_info) { - ASN1_INTEGER *b = TS_TST_INFO_get_nonce(tst_info); + const ASN1_INTEGER *b = TS_TST_INFO_get_nonce(tst_info); /* Error if nonce is missing. */ if (!b) diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c index ed0f819402..b079b50fc3 100644 --- a/crypto/ts/ts_verify_ctx.c +++ b/crypto/ts/ts_verify_ctx.c @@ -114,7 +114,7 @@ TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx) TS_MSG_IMPRINT *imprint; X509_ALGOR *md_alg; ASN1_OCTET_STRING *msg; - ASN1_INTEGER *nonce; + const ASN1_INTEGER *nonce; assert(req != NULL); if (ret) -- 2.25.1