4 files changed, 84 insertions, 12 deletions

diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index 95481fc4c6..f51a8b1fbe 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time.c,v 1.23 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: a_time.c,v 1.24 2015/07/24 13:49:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -69,7 +69,16 @@
 
 #include "o_time.h"
 
-IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
+
+const ASN1_ITEM ASN1_TIME_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_TIME,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "ASN1_TIME",
+};
 
 
 ASN1_TIME *
diff --git a/src/lib/libcrypto/asn1/tasn_typ.c b/src/lib/libcrypto/asn1/tasn_typ.c
index 5b8b4f79f6..5e838e2cf0 100644
--- a/src/lib/libcrypto/asn1/tasn_typ.c
+++ b/src/lib/libcrypto/asn1/tasn_typ.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_typ.c,v 1.11 2015/02/10 09:52:16 jsing Exp $ */
+/* $OpenBSD: tasn_typ.c,v 1.12 2015/07/24 13:49:58 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -595,7 +595,16 @@ ASN1_TYPE_free(ASN1_TYPE *a)
 
 /* Multistring types */
 
-IMPLEMENT_ASN1_MSTRING(ASN1_PRINTABLE, B_ASN1_PRINTABLE)
+
+const ASN1_ITEM ASN1_PRINTABLE_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_PRINTABLE,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "ASN1_PRINTABLE",
+};
 
 ASN1_STRING *
 d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len)
@@ -622,7 +631,16 @@ ASN1_PRINTABLE_free(ASN1_STRING *a)
         ASN1_item_free((ASN1_VALUE *)a, &ASN1_PRINTABLE_it);
 }
 
-IMPLEMENT_ASN1_MSTRING(DISPLAYTEXT, B_ASN1_DISPLAYTEXT)
+
+const ASN1_ITEM DISPLAYTEXT_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_DISPLAYTEXT,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "DISPLAYTEXT",
+};
 
 ASN1_STRING *
 d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len)
@@ -649,7 +667,16 @@ DISPLAYTEXT_free(ASN1_STRING *a)
         ASN1_item_free((ASN1_VALUE *)a, &DISPLAYTEXT_it);
 }
 
-IMPLEMENT_ASN1_MSTRING(DIRECTORYSTRING, B_ASN1_DIRECTORYSTRING)
+
+const ASN1_ITEM DIRECTORYSTRING_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_DIRECTORYSTRING,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "DIRECTORYSTRING",
+};
 
 ASN1_STRING *
 d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len)
diff --git a/src/lib/libssl/src/crypto/asn1/a_time.c b/src/lib/libssl/src/crypto/asn1/a_time.c
index 95481fc4c6..f51a8b1fbe 100644
--- a/src/lib/libssl/src/crypto/asn1/a_time.c
+++ b/src/lib/libssl/src/crypto/asn1/a_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time.c,v 1.23 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: a_time.c,v 1.24 2015/07/24 13:49:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -69,7 +69,16 @@
 
 #include "o_time.h"
 
-IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
+
+const ASN1_ITEM ASN1_TIME_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_TIME,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "ASN1_TIME",
+};
 
 
 ASN1_TIME *
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_typ.c b/src/lib/libssl/src/crypto/asn1/tasn_typ.c
index 5b8b4f79f6..5e838e2cf0 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_typ.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_typ.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_typ.c,v 1.11 2015/02/10 09:52:16 jsing Exp $ */
+/* $OpenBSD: tasn_typ.c,v 1.12 2015/07/24 13:49:58 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -595,7 +595,16 @@ ASN1_TYPE_free(ASN1_TYPE *a)
 
 /* Multistring types */
 
-IMPLEMENT_ASN1_MSTRING(ASN1_PRINTABLE, B_ASN1_PRINTABLE)
+
+const ASN1_ITEM ASN1_PRINTABLE_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_PRINTABLE,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "ASN1_PRINTABLE",
+};
 
 ASN1_STRING *
 d2i_ASN1_PRINTABLE(ASN1_STRING **a, const unsigned char **in, long len)
@@ -622,7 +631,16 @@ ASN1_PRINTABLE_free(ASN1_STRING *a)
         ASN1_item_free((ASN1_VALUE *)a, &ASN1_PRINTABLE_it);
 }
 
-IMPLEMENT_ASN1_MSTRING(DISPLAYTEXT, B_ASN1_DISPLAYTEXT)
+
+const ASN1_ITEM DISPLAYTEXT_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_DISPLAYTEXT,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "DISPLAYTEXT",
+};
 
 ASN1_STRING *
 d2i_DISPLAYTEXT(ASN1_STRING **a, const unsigned char **in, long len)
@@ -649,7 +667,16 @@ DISPLAYTEXT_free(ASN1_STRING *a)
         ASN1_item_free((ASN1_VALUE *)a, &DISPLAYTEXT_it);
 }
 
-IMPLEMENT_ASN1_MSTRING(DIRECTORYSTRING, B_ASN1_DIRECTORYSTRING)
+
+const ASN1_ITEM DIRECTORYSTRING_it = {
+        .itype = ASN1_ITYPE_MSTRING,
+        .utype = B_ASN1_DIRECTORYSTRING,
+        .templates = NULL,
+        .tcount = 0,
+        .funcs = NULL,
+        .size = sizeof(ASN1_STRING),
+        .sname = "DIRECTORYSTRING",
+};
 
 ASN1_STRING *
 d2i_DIRECTORYSTRING(ASN1_STRING **a, const unsigned char **in, long len)