diff options
| author | tb <> | 2025-12-05 14:19:27 +0000 |
|---|---|---|
| committer | tb <> | 2025-12-05 14:19:27 +0000 |
| commit | 9d2d9214b79d3c58a92235befe0378b7ada96773 (patch) | |
| tree | 526d0c6e6e79d5cde410d3592176246f57583320 /src/lib/libcrypto/ts | |
| parent | f3f05f0cf8c30a990193e332e26fdd8e54b3f59b (diff) | |
| download | openbsd-9d2d9214b79d3c58a92235befe0378b7ada96773.tar.gz openbsd-9d2d9214b79d3c58a92235befe0378b7ada96773.tar.bz2 openbsd-9d2d9214b79d3c58a92235befe0378b7ada96773.zip | |
Replace trivial uses of ASN1_STRING_data()
Almost entirely mechanical diff that ensures that for read-only accesses
we use the const correct ASN1_STRING_get0_data(). Arguably, in most
places the better fix would be to reach into ASN1_STRING but then we
have to think and bikeshed...
ok beck kenjiro
Diffstat (limited to 'src/lib/libcrypto/ts')
| -rw-r--r-- | src/lib/libcrypto/ts/ts_lib.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_rsp_verify.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/ts/ts_verify_ctx.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c index 7e40101752..d497fed9d8 100644 --- a/src/lib/libcrypto/ts/ts_lib.c +++ b/src/lib/libcrypto/ts/ts_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_lib.c,v 1.15 2025/01/07 14:22:19 tb Exp $ */ | 1 | /* $OpenBSD: ts_lib.c,v 1.16 2025/12/05 14:19:27 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 | */ |
| @@ -155,7 +155,7 @@ TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) | |||
| 155 | 155 | ||
| 156 | BIO_printf(bio, "Message data:\n"); | 156 | BIO_printf(bio, "Message data:\n"); |
| 157 | msg = TS_MSG_IMPRINT_get_msg(a); | 157 | msg = TS_MSG_IMPRINT_get_msg(a); |
| 158 | BIO_dump_indent(bio, (const char *)ASN1_STRING_data(msg), | 158 | BIO_dump_indent(bio, (const char *)ASN1_STRING_get0_data(msg), |
| 159 | ASN1_STRING_length(msg), 4); | 159 | ASN1_STRING_length(msg), 4); |
| 160 | 160 | ||
| 161 | return 1; | 161 | return 1; |
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c index d38bb3b460..e9a778bb88 100644 --- a/src/lib/libcrypto/ts/ts_rsp_verify.c +++ b/src/lib/libcrypto/ts/ts_rsp_verify.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_rsp_verify.c,v 1.31 2025/05/10 05:54:39 tb Exp $ */ | 1 | /* $OpenBSD: ts_rsp_verify.c,v 1.32 2025/12/05 14:19:27 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 | */ |
| @@ -667,7 +667,7 @@ TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text) | |||
| 667 | ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i); | 667 | ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i); |
| 668 | if (i > 0) | 668 | if (i > 0) |
| 669 | strlcat(result, "/", length); | 669 | strlcat(result, "/", length); |
| 670 | strlcat(result, (const char *)ASN1_STRING_data(current), length); | 670 | strlcat(result, (const char *)ASN1_STRING_get0_data(current), length); |
| 671 | } | 671 | } |
| 672 | return result; | 672 | return result; |
| 673 | } | 673 | } |
| @@ -771,7 +771,7 @@ TS_check_imprints(X509_ALGOR *algor_a, unsigned char *imprint_a, unsigned len_a, | |||
| 771 | 771 | ||
| 772 | /* Compare octet strings. */ | 772 | /* Compare octet strings. */ |
| 773 | ret = len_a == (unsigned) ASN1_STRING_length(b->hashed_msg) && | 773 | ret = len_a == (unsigned) ASN1_STRING_length(b->hashed_msg) && |
| 774 | memcmp(imprint_a, ASN1_STRING_data(b->hashed_msg), len_a) == 0; | 774 | memcmp(imprint_a, ASN1_STRING_get0_data(b->hashed_msg), len_a) == 0; |
| 775 | 775 | ||
| 776 | err: | 776 | err: |
| 777 | if (!ret) | 777 | if (!ret) |
diff --git a/src/lib/libcrypto/ts/ts_verify_ctx.c b/src/lib/libcrypto/ts/ts_verify_ctx.c index 23e2557308..b2b160c511 100644 --- a/src/lib/libcrypto/ts/ts_verify_ctx.c +++ b/src/lib/libcrypto/ts/ts_verify_ctx.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ts_verify_ctx.c,v 1.15 2025/05/10 05:54:39 tb Exp $ */ | 1 | /* $OpenBSD: ts_verify_ctx.c,v 1.16 2025/12/05 14:19:27 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 2003. | 3 | * project 2003. |
| 4 | */ | 4 | */ |
| @@ -215,7 +215,7 @@ TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx) | |||
| 215 | ret->imprint_len = ASN1_STRING_length(msg); | 215 | ret->imprint_len = ASN1_STRING_length(msg); |
| 216 | if (!(ret->imprint = malloc(ret->imprint_len))) | 216 | if (!(ret->imprint = malloc(ret->imprint_len))) |
| 217 | goto err; | 217 | goto err; |
| 218 | memcpy(ret->imprint, ASN1_STRING_data(msg), ret->imprint_len); | 218 | memcpy(ret->imprint, ASN1_STRING_get0_data(msg), ret->imprint_len); |
| 219 | 219 | ||
| 220 | /* Setting nonce. */ | 220 | /* Setting nonce. */ |
| 221 | if ((nonce = TS_REQ_get_nonce(req)) != NULL) { | 221 | if ((nonce = TS_REQ_get_nonce(req)) != NULL) { |
