Expand obsolete M_ASN1.*(cmp|dup|print|set) macros - no change in generated

assembly.

ok bcook@

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c
index f08bb8701d..ac5f65df94 100644
--- a/src/lib/libcrypto/ts/ts_lib.c
+++ b/src/lib/libcrypto/ts/ts_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_lib.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_lib.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -117,7 +117,7 @@ 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);
         }
diff --git a/src/lib/libcrypto/ts/ts_rsp_utils.c b/src/lib/libcrypto/ts/ts_rsp_utils.c
index 0d05814297..39eb2a2963 100644
--- a/src/lib/libcrypto/ts/ts_rsp_utils.c
+++ b/src/lib/libcrypto/ts/ts_rsp_utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_utils.c,v 1.4 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_rsp_utils.c,v 1.5 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -200,7 +200,7 @@ 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;