diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-14 04:16:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-23 13:15:06 +0000 |
| commit | f422a51486a3ab415153eccdc3c3746c53da01f4 (patch) | |
| tree | 7048cd4c4b3857f13ee0468d9059a0e24b17c885 /crypto/ts | |
| parent | 2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe (diff) | |
| download | openssl-f422a51486a3ab415153eccdc3c3746c53da01f4.tar.gz | |
Remove old ASN.1 code.
Remove old M_ASN1_ macros and replace any occurences with the corresponding
function.
Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/ts')
| -rw-r--r-- | crypto/ts/ts_lib.c | 8 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_sign.c | 2 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_utils.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c index 089d5ea73a..6ec1f0c211 100644 --- a/crypto/ts/ts_lib.c +++ b/crypto/ts/ts_lib.c @@ -115,7 +115,7 @@ int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions) BIO_printf(bio, ": %s\n", critical ? "critical" : ""); if (!X509V3_EXT_print(bio, ex, 0, 4)) { BIO_printf(bio, "%4s", ""); - M_ASN1_OCTET_STRING_print(bio, ex->value); + ASN1_STRING_print(bio, ex->value); } BIO_write(bio, "\n", 1); } @@ -132,14 +132,14 @@ int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg) int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a) { - const ASN1_OCTET_STRING *msg; + ASN1_OCTET_STRING *msg; TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a)); BIO_printf(bio, "Message data:\n"); msg = TS_MSG_IMPRINT_get_msg(a); - BIO_dump_indent(bio, (const char *)M_ASN1_STRING_data(msg), - M_ASN1_STRING_length(msg), 4); + BIO_dump_indent(bio, (const char *)ASN1_STRING_data(msg), + ASN1_STRING_length(msg), 4); return 1; } diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index db6ce3241f..b510cebde3 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -1006,7 +1006,7 @@ static ASN1_GENERALIZEDTIME *p++ = '\0'; /* Now call OpenSSL to check and set our genTime value */ - if (!asn1_time && !(asn1_time = M_ASN1_GENERALIZEDTIME_new())) + if (!asn1_time && !(asn1_time = ASN1_GENERALIZEDTIME_new())) goto err; if (!ASN1_GENERALIZEDTIME_set_string(asn1_time, genTime_str)) { ASN1_GENERALIZEDTIME_free(asn1_time); diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c index f6f63329a0..72d9f63771 100644 --- a/crypto/ts/ts_rsp_utils.c +++ b/crypto/ts/ts_rsp_utils.c @@ -186,7 +186,7 @@ int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime) if (a->time == gtime) return 1; - new_time = M_ASN1_GENERALIZEDTIME_dup(gtime); + new_time = ASN1_STRING_dup(gtime); if (new_time == NULL) { TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE); return 0; |