Preliminary streaming ASN1 encode support.

[openssl.git] / crypto / asn1 / asn1t.h

diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h
index ea880d5150dfbd4d41d33ed00921d0613d8e3658..83e8213ea54348af2e5f6ca2e8cbf52530d33b21 100644 (file)
--- a/crypto/asn1/asn1t.h
+++ b/crypto/asn1/asn1t.h
@@ -59,14 +59,56 @@
 #define HEADER_ASN1T_H
 
 #include <stddef.h>
 #define HEADER_ASN1T_H
 
 #include <stddef.h>

+#include <openssl/e_os2.h>

 #include <openssl/asn1.h>
 
 #include <openssl/asn1.h>
 

+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+# undef OPENSSL_EXTERN
+# define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
+

 /* ASN1 template defines, structures and functions */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
 /* ASN1 template defines, structures and functions */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 

+
+#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
+#define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
+
+
+/* Macros for start and end of ASN1_ITEM definition */
+
+#define ASN1_ITEM_start(itname) \
+       OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
+
+#define ASN1_ITEM_end(itname) \
+               };
+
+#else
+
+/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
+#define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))
+
+
+/* Macros for start and end of ASN1_ITEM definition */
+
+#define ASN1_ITEM_start(itname) \
+       const ASN1_ITEM * itname##_it(void) \
+       { \
+               static const ASN1_ITEM local_it = { \
+
+#define ASN1_ITEM_end(itname) \
+               }; \
+       return &local_it; \
+       }
+
+#endif
+
+

 /* Macros to aid ASN1 template writing */
 
 #define ASN1_ITEM_TEMPLATE(tname) \
 /* Macros to aid ASN1 template writing */
 
 #define ASN1_ITEM_TEMPLATE(tname) \


@@ -74,7 +116,7 @@ extern "C" {
 
 #define ASN1_ITEM_TEMPLATE_END(tname) \
        ;\
 
 #define ASN1_ITEM_TEMPLATE_END(tname) \
        ;\

-       const ASN1_ITEM tname##_it = { \
+       ASN1_ITEM_start(tname) \

                ASN1_ITYPE_PRIMITIVE,\
                -1,\
                &tname##_item_tt,\
                ASN1_ITYPE_PRIMITIVE,\
                -1,\
                &tname##_item_tt,\


@@ -82,7 +124,7 @@ extern "C" {
                NULL,\
                0,\
                #tname \
                NULL,\
                0,\
                #tname \

-       }
+       ASN1_ITEM_end(tname)

 
 
 /* This is a ASN1 type which just embeds a template */
 
 
 /* This is a ASN1 type which just embeds a template */


@@ -91,7 +133,7 @@ extern "C" {
  *
  *     ASN1_SEQUENCE(stname) = {
  *             ... SEQUENCE components ...
  *
  *     ASN1_SEQUENCE(stname) = {
  *             ... SEQUENCE components ...

- *     } ASN1_SEQUENCE_END(stname);
+ *     } ASN1_SEQUENCE_END(stname)

  *
  *     This will produce an ASN1_ITEM called stname_it
  *     for a structure called stname.
  *
  *     This will produce an ASN1_ITEM called stname_it
  *     for a structure called stname.


@@ -101,7 +143,7 @@ extern "C" {
  *
  *     ASN1_SEQUENCE(itname) = {
  *             ... SEQUENCE components ...
  *
  *     ASN1_SEQUENCE(itname) = {
  *             ... SEQUENCE components ...

- *     } ASN1_SEQUENCE_END_name(stname, itname);
+ *     } ASN1_SEQUENCE_END_name(stname, itname)

  *
  *     This will create an item called itname_it using
  *     a structure called stname.
  *
  *     This will create an item called itname_it using
  *     a structure called stname.


@@ -114,7 +156,7 @@ extern "C" {
 
 #define ASN1_SEQUENCE_END_name(stname, tname) \
        ;\
 
 #define ASN1_SEQUENCE_END_name(stname, tname) \
        ;\

-       const ASN1_ITEM tname##_it = { \
+       ASN1_ITEM_start(tname) \

                ASN1_ITYPE_SEQUENCE,\
                V_ASN1_SEQUENCE,\
                tname##_seq_tt,\
                ASN1_ITYPE_SEQUENCE,\
                V_ASN1_SEQUENCE,\
                tname##_seq_tt,\


@@ -122,7 +164,10 @@ extern "C" {
                NULL,\
                sizeof(stname),\
                #stname \
                NULL,\
                sizeof(stname),\
                #stname \

-       }
+       ASN1_ITEM_end(tname)
+
+#define ASN1_NDEF_SEQUENCE(tname) \
+       ASN1_SEQUENCE(tname)

 
 #define ASN1_SEQUENCE_cb(tname, cb) \
        const static ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
 
 #define ASN1_SEQUENCE_cb(tname, cb) \
        const static ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \


@@ -140,6 +185,18 @@ extern "C" {
        const static ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
        ASN1_SEQUENCE(tname)
 
        const static ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
        ASN1_SEQUENCE(tname)
 

+#define ASN1_NDEF_SEQUENCE_END(tname) \
+       ;\
+       ASN1_ITEM_start(tname) \
+               ASN1_ITYPE_NDEF_SEQUENCE,\
+               V_ASN1_SEQUENCE,\
+               tname##_seq_tt,\
+               sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
+               NULL,\
+               sizeof(tname),\
+               #tname \
+       ASN1_ITEM_end(tname)
+

 #define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
 
 #define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
 #define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
 
 #define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)


@@ -148,7 +205,7 @@ extern "C" {
 
 #define ASN1_SEQUENCE_END_ref(stname, tname) \
        ;\
 
 #define ASN1_SEQUENCE_END_ref(stname, tname) \
        ;\

-       const ASN1_ITEM tname##_it = { \
+       ASN1_ITEM_start(tname) \

                ASN1_ITYPE_SEQUENCE,\
                V_ASN1_SEQUENCE,\
                tname##_seq_tt,\
                ASN1_ITYPE_SEQUENCE,\
                V_ASN1_SEQUENCE,\
                tname##_seq_tt,\


@@ -156,14 +213,14 @@ extern "C" {
                &tname##_aux,\
                sizeof(stname),\
                #stname \
                &tname##_aux,\
                sizeof(stname),\
                #stname \

-       }
+       ASN1_ITEM_end(tname)

 
 
 /* This pair helps declare a CHOICE type. We can do:
  *
  *     ASN1_CHOICE(chname) = {
  *             ... CHOICE options ...
 
 
 /* This pair helps declare a CHOICE type. We can do:
  *
  *     ASN1_CHOICE(chname) = {
  *             ... CHOICE options ...

- *     ASN1_CHOICE_END(chname);
+ *     ASN1_CHOICE_END(chname)

  *
  *     This will produce an ASN1_ITEM called chname_it
  *     for a structure called chname. The structure
  *
  *     This will produce an ASN1_ITEM called chname_it
  *     for a structure called chname. The structure


@@ -194,7 +251,7 @@ extern "C" {
 
 #define ASN1_CHOICE_END_selector(stname, tname, selname) \
        ;\
 
 #define ASN1_CHOICE_END_selector(stname, tname, selname) \
        ;\

-       const ASN1_ITEM tname##_it = { \
+       ASN1_ITEM_start(tname) \

                ASN1_ITYPE_CHOICE,\
                offsetof(stname,selname) ,\
                tname##_ch_tt,\
                ASN1_ITYPE_CHOICE,\
                offsetof(stname,selname) ,\
                tname##_ch_tt,\


@@ -202,11 +259,11 @@ extern "C" {
                NULL,\
                sizeof(stname),\
                #stname \
                NULL,\
                sizeof(stname),\
                #stname \

-       }
+       ASN1_ITEM_end(tname)

 
 #define ASN1_CHOICE_END_cb(stname, tname, selname) \
        ;\
 
 #define ASN1_CHOICE_END_cb(stname, tname, selname) \
        ;\

-       const ASN1_ITEM tname##_it = { \
+       ASN1_ITEM_start(tname) \

                ASN1_ITYPE_CHOICE,\
                offsetof(stname,selname) ,\
                tname##_ch_tt,\
                ASN1_ITYPE_CHOICE,\
                offsetof(stname,selname) ,\
                tname##_ch_tt,\


@@ -214,13 +271,13 @@ extern "C" {
                &tname##_aux,\
                sizeof(stname),\
                #stname \
                &tname##_aux,\
                sizeof(stname),\
                #stname \

-       }
+       ASN1_ITEM_end(tname)

 
 /* This helps with the template wrapper form of ASN1_ITEM */
 
 #define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
        (flags), (tag), 0,\
 
 /* This helps with the template wrapper form of ASN1_ITEM */
 
 #define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
        (flags), (tag), 0,\

-       #name, &(type##_it) }
+       #name, ASN1_ITEM_ref(type) }

 
 /* These help with SEQUENCE or CHOICE components */
 
 
 /* These help with SEQUENCE or CHOICE components */
 


@@ -228,12 +285,12 @@ extern "C" {
 
 #define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
        (flags), (tag), offsetof(stname, field),\
 
 #define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
        (flags), (tag), offsetof(stname, field),\

-       #field, &(type##_it) }
+       #field, ASN1_ITEM_ref(type) }

 
 /* used when the structure is combined with the parent */
 
 #define ASN1_EX_COMBINE(flags, tag, type) { \
 
 /* used when the structure is combined with the parent */
 
 #define ASN1_EX_COMBINE(flags, tag, type) { \

-       (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, &(type##_it) }
+       (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }

 
 /* implicit and explicit helper macros */
 
 
 /* implicit and explicit helper macros */
 


@@ -245,9 +302,13 @@ extern "C" {
 
 /* Any defined by macros: the field used is in the table itself */
 
 
 /* Any defined by macros: the field used is in the table itself */
 

-#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, &(tblname##_adb) }
-#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, &(tblname##_adb) }
-
+#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
+#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
+#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
+#else
+#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
+#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
+#endif

 /* Plain simple type */
 #define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
 
 /* Plain simple type */
 #define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
 


@@ -307,11 +368,17 @@ extern "C" {
 #define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
 
 #define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
 

+/* EXPLICIT OPTIONAL using indefinite length constructed form */
+#define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
+                       ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
+

 /* Macros for the ASN1_ADB structure */
 
 #define ASN1_ADB(name) \
        const static ASN1_ADB_TABLE name##_adbtbl[] 
 
 /* Macros for the ASN1_ADB structure */
 
 #define ASN1_ADB(name) \
        const static ASN1_ADB_TABLE name##_adbtbl[] 
 

+#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
+

 #define ASN1_ADB_END(name, flags, field, app_table, def, none) \
        ;\
        const static ASN1_ADB name##_adb = {\
 #define ASN1_ADB_END(name, flags, field, app_table, def, none) \
        ;\
        const static ASN1_ADB name##_adb = {\


@@ -324,6 +391,28 @@ extern "C" {
                none\
        }
 
                none\
        }
 

+#else
+
+#define ASN1_ADB_END(name, flags, field, app_table, def, none) \
+       ;\
+       const static ASN1_ITEM *name##_adb(void) \
+       { \
+       const static ASN1_ADB internal_adb = \
+               {\
+               flags,\
+               offsetof(name, field),\
+               app_table,\
+               name##_adbtbl,\
+               sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
+               def,\
+               none\
+               }; \
+               return (const ASN1_ITEM *) &internal_adb; \
+       } \
+       void dummy_function(void)
+
+#endif
+

 #define ADB_ENTRY(val, template) {val, template}
 
 #define ASN1_ADB_TEMPLATE(name) \
 #define ADB_ENTRY(val, template) {val, template}
 
 #define ASN1_ADB_TEMPLATE(name) \


@@ -342,9 +431,13 @@ unsigned long offset;              /* Offset of this field in structure */
 #ifndef NO_ASN1_FIELD_NAMES
 char *field_name;              /* Field name */
 #endif
 #ifndef NO_ASN1_FIELD_NAMES
 char *field_name;              /* Field name */
 #endif

-const void *item;              /* Relevant ASN1_ITEM or ASN1_ADB */
+ASN1_ITEM_EXP *item;           /* Relevant ASN1_ITEM or ASN1_ADB */

 };
 
 };
 

+/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
+
+#define ASN1_TEMPLATE_item(t) (t->item_ptr)
+#define ASN1_TEMPLATE_adb(t) (t->item_ptr)

 
 typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
 typedef struct ASN1_ADB_st ASN1_ADB;
 
 typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
 typedef struct ASN1_ADB_st ASN1_ADB;


@@ -444,6 +537,13 @@ struct ASN1_ADB_TABLE_st {
 
 #define ASN1_TFLG_COMBINE      (0x1<<10)
 
 
 #define ASN1_TFLG_COMBINE      (0x1<<10)
 

+/* This flag when present in a SEQUENCE OF, SET OF
+ * or EXPLICIT causes indefinite length constructed
+ * encoding to be used if required.
+ */
+
+#define ASN1_TFLG_NDEF         (0x1<<11)
+

 /* This is the actual ASN1 item itself */
 
 struct ASN1_ITEM_st {
 /* This is the actual ASN1 item itself */
 
 struct ASN1_ITEM_st {


@@ -496,19 +596,25 @@ const char *sname;                /* Structure name */
  * has a special meaning, it is used as a mask
  * of acceptable types using the B_ASN1 constants.
  *
  * has a special meaning, it is used as a mask
  * of acceptable types using the B_ASN1 constants.
  *

+ * NDEF_SEQUENCE is the same as SEQUENCE except
+ * that it will use indefinite length constructed
+ * encoding if requested.
+ *

  */
 
  */
 

-#define ASN1_ITYPE_PRIMITIVE   0x0
+#define ASN1_ITYPE_PRIMITIVE           0x0

 
 

-#define ASN1_ITYPE_SEQUENCE    0x1
+#define ASN1_ITYPE_SEQUENCE            0x1

 
 

-#define ASN1_ITYPE_CHOICE      0x2
+#define ASN1_ITYPE_CHOICE              0x2

 
 

-#define ASN1_ITYPE_COMPAT      0x3
+#define ASN1_ITYPE_COMPAT              0x3

 
 

-#define ASN1_ITYPE_EXTERN      0x4
+#define ASN1_ITYPE_EXTERN              0x4

 
 

-#define ASN1_ITYPE_MSTRING     0x5
+#define ASN1_ITYPE_MSTRING             0x5
+
+#define ASN1_ITYPE_NDEF_SEQUENCE       0x6

 
 /* Cache for ASN1 tag and length, so we
  * don't keep re-reading it for things
 
 /* Cache for ASN1 tag and length, so we
  * don't keep re-reading it for things


@@ -617,12 +723,16 @@ typedef struct ASN1_AUX_st {
 
 /* Macro to implement a primitive type */
 #define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
 
 /* Macro to implement a primitive type */
 #define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)

-#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) const ASN1_ITEM itname##_it = \
-                               { ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname};
+#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
+                               ASN1_ITEM_start(itname) \
+                                       ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
+                               ASN1_ITEM_end(itname)

 
 /* Macro to implement a multi string type */
 
 /* Macro to implement a multi string type */

-#define IMPLEMENT_ASN1_MSTRING(itname, mask) const ASN1_ITEM itname##_it = \
-                               { ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname};
+#define IMPLEMENT_ASN1_MSTRING(itname, mask) \
+                               ASN1_ITEM_start(itname) \
+                                       ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
+                               ASN1_ITEM_end(itname)

 
 /* Macro to implement an ASN1_ITEM in terms of old style funcs */
 
 
 /* Macro to implement an ASN1_ITEM in terms of old style funcs */
 


@@ -635,7 +745,7 @@ typedef struct ASN1_AUX_st {
                (ASN1_d2i_func *)d2i_##sname, \
                (ASN1_i2d_func *)i2d_##sname, \
        }; \
                (ASN1_d2i_func *)d2i_##sname, \
                (ASN1_i2d_func *)i2d_##sname, \
        }; \

-       ASN1_ITEM const sname##_it = { \
+       ASN1_ITEM_start(sname) \

                ASN1_ITYPE_COMPAT, \
                tag, \
                NULL, \
                ASN1_ITYPE_COMPAT, \
                tag, \
                NULL, \


@@ -643,10 +753,10 @@ typedef struct ASN1_AUX_st {
                &sname##_ff, \
                0, \
                #sname \
                &sname##_ff, \
                0, \
                #sname \

-       }
+       ASN1_ITEM_end(sname)

 
 #define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
 
 #define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \

-       const ASN1_ITEM sname##_it = { \
+       ASN1_ITEM_start(sname) \

                ASN1_ITYPE_EXTERN, \
                tag, \
                NULL, \
                ASN1_ITYPE_EXTERN, \
                tag, \
                NULL, \


@@ -654,7 +764,7 @@ typedef struct ASN1_AUX_st {
                &fptrs, \
                0, \
                #sname \
                &fptrs, \
                0, \
                #sname \

-       };
+       ASN1_ITEM_end(sname)

 
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
 
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 


@@ -668,11 +778,11 @@ typedef struct ASN1_AUX_st {
 #define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
        stname *fname##_new(void) \
        { \
 #define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
        stname *fname##_new(void) \
        { \

-               return (stname *)ASN1_item_new(&itname##_it); \
+               return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \

        } \
        void fname##_free(stname *a) \
        { \
        } \
        void fname##_free(stname *a) \
        { \

-               ASN1_item_free((ASN1_VALUE *)a, &itname##_it); \
+               ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \

        }
 
 #define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
        }
 
 #define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \


@@ -682,11 +792,17 @@ typedef struct ASN1_AUX_st {
 #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
        stname *d2i_##fname(stname **a, unsigned char **in, long len) \
        { \
 #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
        stname *d2i_##fname(stname **a, unsigned char **in, long len) \
        { \

-               return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, &itname##_it);\
+               return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\

        } \
        int i2d_##fname(stname *a, unsigned char **out) \
        { \
        } \
        int i2d_##fname(stname *a, unsigned char **out) \
        { \

-               return ASN1_item_i2d((ASN1_VALUE *)a, out, &itname##_it);\
+               return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
+       } 
+
+#define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
+       int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
+       { \
+               return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\

        } 
 
 /* This includes evil casts to remove const: they will go away when full
        } 
 
 /* This includes evil casts to remove const: they will go away when full


@@ -695,13 +811,19 @@ typedef struct ASN1_AUX_st {
 #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
        { \
 #define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
        { \

-               return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, (unsigned char **)in, len, &itname##_it);\
+               return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, (unsigned char **)in, len, ASN1_ITEM_rptr(itname));\

        } \
        int i2d_##fname(const stname *a, unsigned char **out) \
        { \
        } \
        int i2d_##fname(const stname *a, unsigned char **out) \
        { \

-               return ASN1_item_i2d((ASN1_VALUE *)a, out, &itname##_it);\
+               return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\

        } 
 
        } 
 

+#define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
+       stname * stname##_dup(stname *x) \
+        { \
+        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
+        }
+

 #define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
                IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
 
 #define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
                IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
 


@@ -711,16 +833,15 @@ typedef struct ASN1_AUX_st {
 
 /* external definitions for primitive types */
 
 
 /* external definitions for primitive types */
 

-extern const ASN1_ITEM ASN1_BOOLEAN_it;
-extern const ASN1_ITEM ASN1_TBOOLEAN_it;
-extern const ASN1_ITEM ASN1_FBOOLEAN_it;
-extern const ASN1_ITEM ASN1_OBJECT_it;
-extern const ASN1_ITEM ASN1_ANY_it;
-extern const ASN1_ITEM ASN1_SEQUENCE_it;
-extern const ASN1_ITEM CBIGNUM_it;
-extern const ASN1_ITEM BIGNUM_it;
-extern const ASN1_ITEM LONG_it;
-extern const ASN1_ITEM ZLONG_it;
+DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
+DECLARE_ASN1_ITEM(ASN1_TBOOLEAN)
+DECLARE_ASN1_ITEM(ASN1_FBOOLEAN)
+DECLARE_ASN1_ITEM(ASN1_ANY)
+DECLARE_ASN1_ITEM(ASN1_SEQUENCE)
+DECLARE_ASN1_ITEM(CBIGNUM)
+DECLARE_ASN1_ITEM(BIGNUM)
+DECLARE_ASN1_ITEM(LONG)
+DECLARE_ASN1_ITEM(ZLONG)

 
 DECLARE_STACK_OF(ASN1_VALUE)
 
 
 DECLARE_STACK_OF(ASN1_VALUE)