Preliminary streaming ASN1 encode support.
[openssl.git] / crypto / asn1 / asn1t.h
index 94749cf..83e8213 100644 (file)
@@ -74,7 +74,7 @@ extern "C" {
 #endif
 
 
-#ifndef ASN1_ITEM_FUNCTIONS
+#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))
@@ -86,7 +86,7 @@ extern "C" {
        OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
 
 #define ASN1_ITEM_end(itname) \
-               }
+               };
 
 #else
 
@@ -104,8 +104,7 @@ extern "C" {
 #define ASN1_ITEM_end(itname) \
                }; \
        return &local_it; \
-       }\
-       void dummy_function(void)
+       }
 
 #endif
 
@@ -134,7 +133,7 @@ extern "C" {
  *
  *     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.
@@ -144,7 +143,7 @@ extern "C" {
  *
  *     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.
@@ -167,6 +166,9 @@ extern "C" {
                #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}; \
        ASN1_SEQUENCE(tname)
@@ -183,6 +185,18 @@ extern "C" {
        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)
@@ -206,7 +220,7 @@ extern "C" {
  *
  *     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
@@ -288,7 +302,7 @@ extern "C" {
 
 /* Any defined by macros: the field used is in the table itself */
 
-#ifndef ASN1_ITEM_FUNCTIONS
+#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
@@ -354,12 +368,16 @@ 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)
 
+/* 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[] 
 
-#ifndef ASN1_ITEM_FUNCTIONS
+#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
 
 #define ASN1_ADB_END(name, flags, field, app_table, def, none) \
        ;\
@@ -519,6 +537,13 @@ struct ASN1_ADB_TABLE_st {
 
 #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 {
@@ -571,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.
  *
+ * 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
@@ -695,13 +726,13 @@ typedef struct ASN1_AUX_st {
 #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);
+                               ASN1_ITEM_end(itname)
 
 /* Macro to implement a multi string type */
 #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);
+                               ASN1_ITEM_end(itname)
 
 /* Macro to implement an ASN1_ITEM in terms of old style funcs */
 
@@ -722,7 +753,7 @@ typedef struct ASN1_AUX_st {
                &sname##_ff, \
                0, \
                #sname \
-       ASN1_ITEM_end(sname);
+       ASN1_ITEM_end(sname)
 
 #define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
        ASN1_ITEM_start(sname) \
@@ -733,7 +764,7 @@ typedef struct ASN1_AUX_st {
                &fptrs, \
                0, \
                #sname \
-       ASN1_ITEM_end(sname);
+       ASN1_ITEM_end(sname)
 
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
@@ -768,6 +799,12 @@ typedef struct ASN1_AUX_st {
                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
  * ASN1 constification is done.
  */
@@ -781,6 +818,12 @@ typedef struct ASN1_AUX_st {
                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)