OSDN Git Service

Update OpenSSL to 1.0.2a.
[ffftp/ffftp.git] / contrib / openssl / include / openssl / asn1.h
index 759f376..0058241 100644 (file)
  */\r
 \r
 #ifndef HEADER_ASN1_H\r
-#define HEADER_ASN1_H\r
+# define HEADER_ASN1_H\r
 \r
-#include <time.h>\r
-#include <openssl/e_os2.h>\r
-#ifndef OPENSSL_NO_BIO\r
-#include <openssl/bio.h>\r
-#endif\r
-#include <openssl/stack.h>\r
-#include <openssl/safestack.h>\r
+# include <time.h>\r
+# include <openssl/e_os2.h>\r
+# ifndef OPENSSL_NO_BIO\r
+#  include <openssl/bio.h>\r
+# endif\r
+# include <openssl/stack.h>\r
+# include <openssl/safestack.h>\r
 \r
-#include <openssl/symhacks.h>\r
+# include <openssl/symhacks.h>\r
 \r
-#include <openssl/ossl_typ.h>\r
-#ifndef OPENSSL_NO_DEPRECATED\r
-#include <openssl/bn.h>\r
-#endif\r
+# include <openssl/ossl_typ.h>\r
+# ifndef OPENSSL_NO_DEPRECATED\r
+#  include <openssl/bn.h>\r
+# endif\r
 \r
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO\r
-# undef OPENSSL_EXTERN\r
-# define OPENSSL_EXTERN OPENSSL_EXPORT\r
-#endif\r
+# ifdef OPENSSL_BUILD_SHLIBCRYPTO\r
+#  undef OPENSSL_EXTERN\r
+#  define OPENSSL_EXTERN OPENSSL_EXPORT\r
+# endif\r
 \r
 #ifdef  __cplusplus\r
 extern "C" {\r
 #endif\r
 \r
-#define V_ASN1_UNIVERSAL               0x00\r
-#define        V_ASN1_APPLICATION              0x40\r
-#define V_ASN1_CONTEXT_SPECIFIC                0x80\r
-#define V_ASN1_PRIVATE                 0xc0\r
-\r
-#define V_ASN1_CONSTRUCTED             0x20\r
-#define V_ASN1_PRIMITIVE_TAG           0x1f\r
-#define V_ASN1_PRIMATIVE_TAG           0x1f\r
-\r
-#define V_ASN1_APP_CHOOSE              -2      /* let the recipient choose */\r
-#define V_ASN1_OTHER                   -3      /* used in ASN1_TYPE */\r
-#define V_ASN1_ANY                     -4      /* used in ASN1 template code */\r
-\r
-#define V_ASN1_NEG                     0x100   /* negative flag */\r
-\r
-#define V_ASN1_UNDEF                   -1\r
-#define V_ASN1_EOC                     0\r
-#define V_ASN1_BOOLEAN                 1       /**/\r
-#define V_ASN1_INTEGER                 2\r
-#define V_ASN1_NEG_INTEGER             (2 | V_ASN1_NEG)\r
-#define V_ASN1_BIT_STRING              3\r
-#define V_ASN1_OCTET_STRING            4\r
-#define V_ASN1_NULL                    5\r
-#define V_ASN1_OBJECT                  6\r
-#define V_ASN1_OBJECT_DESCRIPTOR       7\r
-#define V_ASN1_EXTERNAL                        8\r
-#define V_ASN1_REAL                    9\r
-#define V_ASN1_ENUMERATED              10\r
-#define V_ASN1_NEG_ENUMERATED          (10 | V_ASN1_NEG)\r
-#define V_ASN1_UTF8STRING              12\r
-#define V_ASN1_SEQUENCE                        16\r
-#define V_ASN1_SET                     17\r
-#define V_ASN1_NUMERICSTRING           18      /**/\r
-#define V_ASN1_PRINTABLESTRING         19\r
-#define V_ASN1_T61STRING               20\r
-#define V_ASN1_TELETEXSTRING           20      /* alias */\r
-#define V_ASN1_VIDEOTEXSTRING          21      /**/\r
-#define V_ASN1_IA5STRING               22\r
-#define V_ASN1_UTCTIME                 23\r
-#define V_ASN1_GENERALIZEDTIME         24      /**/\r
-#define V_ASN1_GRAPHICSTRING           25      /**/\r
-#define V_ASN1_ISO64STRING             26      /**/\r
-#define V_ASN1_VISIBLESTRING           26      /* alias */\r
-#define V_ASN1_GENERALSTRING           27      /**/\r
-#define V_ASN1_UNIVERSALSTRING         28      /**/\r
-#define V_ASN1_BMPSTRING               30\r
-\r
+# define V_ASN1_UNIVERSAL                0x00\r
+# define V_ASN1_APPLICATION              0x40\r
+# define V_ASN1_CONTEXT_SPECIFIC         0x80\r
+# define V_ASN1_PRIVATE                  0xc0\r
+\r
+# define V_ASN1_CONSTRUCTED              0x20\r
+# define V_ASN1_PRIMITIVE_TAG            0x1f\r
+# define V_ASN1_PRIMATIVE_TAG            0x1f\r
+\r
+# define V_ASN1_APP_CHOOSE               -2/* let the recipient choose */\r
+# define V_ASN1_OTHER                    -3/* used in ASN1_TYPE */\r
+# define V_ASN1_ANY                      -4/* used in ASN1 template code */\r
+\r
+# define V_ASN1_NEG                      0x100/* negative flag */\r
+\r
+# define V_ASN1_UNDEF                    -1\r
+# define V_ASN1_EOC                      0\r
+# define V_ASN1_BOOLEAN                  1 /**/\r
+# define V_ASN1_INTEGER                  2\r
+# define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)\r
+# define V_ASN1_BIT_STRING               3\r
+# define V_ASN1_OCTET_STRING             4\r
+# define V_ASN1_NULL                     5\r
+# define V_ASN1_OBJECT                   6\r
+# define V_ASN1_OBJECT_DESCRIPTOR        7\r
+# define V_ASN1_EXTERNAL                 8\r
+# define V_ASN1_REAL                     9\r
+# define V_ASN1_ENUMERATED               10\r
+# define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)\r
+# define V_ASN1_UTF8STRING               12\r
+# define V_ASN1_SEQUENCE                 16\r
+# define V_ASN1_SET                      17\r
+# define V_ASN1_NUMERICSTRING            18 /**/\r
+# define V_ASN1_PRINTABLESTRING          19\r
+# define V_ASN1_T61STRING                20\r
+# define V_ASN1_TELETEXSTRING            20/* alias */\r
+# define V_ASN1_VIDEOTEXSTRING           21 /**/\r
+# define V_ASN1_IA5STRING                22\r
+# define V_ASN1_UTCTIME                  23\r
+# define V_ASN1_GENERALIZEDTIME          24 /**/\r
+# define V_ASN1_GRAPHICSTRING            25 /**/\r
+# define V_ASN1_ISO64STRING              26 /**/\r
+# define V_ASN1_VISIBLESTRING            26/* alias */\r
+# define V_ASN1_GENERALSTRING            27 /**/\r
+# define V_ASN1_UNIVERSALSTRING          28 /**/\r
+# define V_ASN1_BMPSTRING                30\r
 /* For use with d2i_ASN1_type_bytes() */\r
-#define B_ASN1_NUMERICSTRING   0x0001\r
-#define B_ASN1_PRINTABLESTRING 0x0002\r
-#define B_ASN1_T61STRING       0x0004\r
-#define B_ASN1_TELETEXSTRING   0x0004\r
-#define B_ASN1_VIDEOTEXSTRING  0x0008\r
-#define B_ASN1_IA5STRING       0x0010\r
-#define B_ASN1_GRAPHICSTRING   0x0020\r
-#define B_ASN1_ISO64STRING     0x0040\r
-#define B_ASN1_VISIBLESTRING   0x0040\r
-#define B_ASN1_GENERALSTRING   0x0080\r
-#define B_ASN1_UNIVERSALSTRING 0x0100\r
-#define B_ASN1_OCTET_STRING    0x0200\r
-#define B_ASN1_BIT_STRING      0x0400\r
-#define B_ASN1_BMPSTRING       0x0800\r
-#define B_ASN1_UNKNOWN         0x1000\r
-#define B_ASN1_UTF8STRING      0x2000\r
-#define B_ASN1_UTCTIME         0x4000\r
-#define B_ASN1_GENERALIZEDTIME 0x8000\r
-#define B_ASN1_SEQUENCE                0x10000\r
-\r
+# define B_ASN1_NUMERICSTRING    0x0001\r
+# define B_ASN1_PRINTABLESTRING  0x0002\r
+# define B_ASN1_T61STRING        0x0004\r
+# define B_ASN1_TELETEXSTRING    0x0004\r
+# define B_ASN1_VIDEOTEXSTRING   0x0008\r
+# define B_ASN1_IA5STRING        0x0010\r
+# define B_ASN1_GRAPHICSTRING    0x0020\r
+# define B_ASN1_ISO64STRING      0x0040\r
+# define B_ASN1_VISIBLESTRING    0x0040\r
+# define B_ASN1_GENERALSTRING    0x0080\r
+# define B_ASN1_UNIVERSALSTRING  0x0100\r
+# define B_ASN1_OCTET_STRING     0x0200\r
+# define B_ASN1_BIT_STRING       0x0400\r
+# define B_ASN1_BMPSTRING        0x0800\r
+# define B_ASN1_UNKNOWN          0x1000\r
+# define B_ASN1_UTF8STRING       0x2000\r
+# define B_ASN1_UTCTIME          0x4000\r
+# define B_ASN1_GENERALIZEDTIME  0x8000\r
+# define B_ASN1_SEQUENCE         0x10000\r
 /* For use with ASN1_mbstring_copy() */\r
-#define MBSTRING_FLAG          0x1000\r
-#define MBSTRING_UTF8          (MBSTRING_FLAG)\r
-#define MBSTRING_ASC           (MBSTRING_FLAG|1)\r
-#define MBSTRING_BMP           (MBSTRING_FLAG|2)\r
-#define MBSTRING_UNIV          (MBSTRING_FLAG|4)\r
-\r
-#define SMIME_OLDMIME          0x400\r
-#define SMIME_CRLFEOL          0x800\r
-#define SMIME_STREAM           0x1000\r
-\r
-struct X509_algor_st;\r
+# define MBSTRING_FLAG           0x1000\r
+# define MBSTRING_UTF8           (MBSTRING_FLAG)\r
+# define MBSTRING_ASC            (MBSTRING_FLAG|1)\r
+# define MBSTRING_BMP            (MBSTRING_FLAG|2)\r
+# define MBSTRING_UNIV           (MBSTRING_FLAG|4)\r
+# define SMIME_OLDMIME           0x400\r
+# define SMIME_CRLFEOL           0x800\r
+# define SMIME_STREAM            0x1000\r
+    struct X509_algor_st;\r
 DECLARE_STACK_OF(X509_ALGOR)\r
 \r
-#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */\r
-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */\r
-\r
-/* We MUST make sure that, except for constness, asn1_ctx_st and\r
-   asn1_const_ctx are exactly the same.  Fortunately, as soon as\r
-   the old ASN1 parsing macros are gone, we can throw this away\r
-   as well... */\r
-typedef struct asn1_ctx_st\r
-       {\r
-       unsigned char *p;/* work char pointer */\r
-       int eos;        /* end of sequence read for indefinite encoding */\r
-       int error;      /* error code to use when returning an error */\r
-       int inf;        /* constructed if 0x20, indefinite is 0x21 */\r
-       int tag;        /* tag from last 'get object' */\r
-       int xclass;     /* class from last 'get object' */\r
-       long slen;      /* length of last 'get object' */\r
-       unsigned char *max; /* largest value of p allowed */\r
-       unsigned char *q;/* temporary variable */\r
-       unsigned char **pp;/* variable */\r
-       int line;       /* used in error processing */\r
-       } ASN1_CTX;\r
-\r
-typedef struct asn1_const_ctx_st\r
-       {\r
-       const unsigned char *p;/* work char pointer */\r
-       int eos;        /* end of sequence read for indefinite encoding */\r
-       int error;      /* error code to use when returning an error */\r
-       int inf;        /* constructed if 0x20, indefinite is 0x21 */\r
-       int tag;        /* tag from last 'get object' */\r
-       int xclass;     /* class from last 'get object' */\r
-       long slen;      /* length of last 'get object' */\r
-       const unsigned char *max; /* largest value of p allowed */\r
-       const unsigned char *q;/* temporary variable */\r
-       const unsigned char **pp;/* variable */\r
-       int line;       /* used in error processing */\r
-       } ASN1_const_CTX;\r
-\r
-/* These are used internally in the ASN1_OBJECT to keep track of\r
- * whether the names and data need to be free()ed */\r
-#define ASN1_OBJECT_FLAG_DYNAMIC        0x01   /* internal use */\r
-#define ASN1_OBJECT_FLAG_CRITICAL       0x02   /* critical x509v3 object id */\r
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04  /* internal use */\r
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA   0x08   /* internal use */\r
-typedef struct asn1_object_st\r
-       {\r
-       const char *sn,*ln;\r
-       int nid;\r
-       int length;\r
-       const unsigned char *data;      /* data remains const after init */\r
-       int flags;      /* Should we free this one */\r
-       } ASN1_OBJECT;\r
-\r
-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */\r
-/* This indicates that the ASN1_STRING is not a real value but just a place\r
- * holder for the location where indefinite length constructed data should\r
- * be inserted in the memory buffer\r
+# define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */\r
+# define IMPLEMENT_ASN1_SET_OF(type)/* nothing, no longer needed */\r
+\r
+/*\r
+ * We MUST make sure that, except for constness, asn1_ctx_st and\r
+ * asn1_const_ctx are exactly the same.  Fortunately, as soon as the old ASN1\r
+ * parsing macros are gone, we can throw this away as well...\r
+ */\r
+typedef struct asn1_ctx_st {\r
+    unsigned char *p;           /* work char pointer */\r
+    int eos;                    /* end of sequence read for indefinite\r
+                                 * encoding */\r
+    int error;                  /* error code to use when returning an error */\r
+    int inf;                    /* constructed if 0x20, indefinite is 0x21 */\r
+    int tag;                    /* tag from last 'get object' */\r
+    int xclass;                 /* class from last 'get object' */\r
+    long slen;                  /* length of last 'get object' */\r
+    unsigned char *max;         /* largest value of p allowed */\r
+    unsigned char *q;           /* temporary variable */\r
+    unsigned char **pp;         /* variable */\r
+    int line;                   /* used in error processing */\r
+} ASN1_CTX;\r
+\r
+typedef struct asn1_const_ctx_st {\r
+    const unsigned char *p;     /* work char pointer */\r
+    int eos;                    /* end of sequence read for indefinite\r
+                                 * encoding */\r
+    int error;                  /* error code to use when returning an error */\r
+    int inf;                    /* constructed if 0x20, indefinite is 0x21 */\r
+    int tag;                    /* tag from last 'get object' */\r
+    int xclass;                 /* class from last 'get object' */\r
+    long slen;                  /* length of last 'get object' */\r
+    const unsigned char *max;   /* largest value of p allowed */\r
+    const unsigned char *q;     /* temporary variable */\r
+    const unsigned char **pp;   /* variable */\r
+    int line;                   /* used in error processing */\r
+} ASN1_const_CTX;\r
+\r
+/*\r
+ * These are used internally in the ASN1_OBJECT to keep track of whether the\r
+ * names and data need to be free()ed\r
+ */\r
+# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */\r
+# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */\r
+# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */\r
+# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */\r
+struct asn1_object_st {\r
+    const char *sn, *ln;\r
+    int nid;\r
+    int length;\r
+    const unsigned char *data;  /* data remains const after init */\r
+    int flags;                  /* Should we free this one */\r
+};\r
+\r
+# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */\r
+/*\r
+ * This indicates that the ASN1_STRING is not a real value but just a place\r
+ * holder for the location where indefinite length constructed data should be\r
+ * inserted in the memory buffer\r
  */\r
-#define ASN1_STRING_FLAG_NDEF 0x010\r
+# define ASN1_STRING_FLAG_NDEF 0x010\r
 \r
-/* This flag is used by the CMS code to indicate that a string is not\r
- * complete and is a place holder for content when it had all been\r
- * accessed. The flag will be reset when content has been written to it.\r
+/*\r
+ * This flag is used by the CMS code to indicate that a string is not\r
+ * complete and is a place holder for content when it had all been accessed.\r
+ * The flag will be reset when content has been written to it.\r
  */\r
 \r
-#define ASN1_STRING_FLAG_CONT 0x020\r
-/* This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING\r
+# define ASN1_STRING_FLAG_CONT 0x020\r
+/*\r
+ * This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING\r
  * type.\r
  */\r
-#define ASN1_STRING_FLAG_MSTRING 0x040\r
+# define ASN1_STRING_FLAG_MSTRING 0x040\r
 /* This is the base type that holds just about everything :-) */\r
-struct asn1_string_st\r
-       {\r
-       int length;\r
-       int type;\r
-       unsigned char *data;\r
-       /* The value of the following field depends on the type being\r
-        * held.  It is mostly being used for BIT_STRING so if the\r
-        * input data has a non-zero 'unused bits' value, it will be\r
-        * handled correctly */\r
-       long flags;\r
-       };\r
-\r
-/* ASN1_ENCODING structure: this is used to save the received\r
- * encoding of an ASN1 type. This is useful to get round\r
- * problems with invalid encodings which can break signatures.\r
+struct asn1_string_st {\r
+    int length;\r
+    int type;\r
+    unsigned char *data;\r
+    /*\r
+     * The value of the following field depends on the type being held.  It\r
+     * is mostly being used for BIT_STRING so if the input data has a\r
+     * non-zero 'unused bits' value, it will be handled correctly\r
+     */\r
+    long flags;\r
+};\r
+\r
+/*\r
+ * ASN1_ENCODING structure: this is used to save the received encoding of an\r
+ * ASN1 type. This is useful to get round problems with invalid encodings\r
+ * which can break signatures.\r
  */\r
 \r
-typedef struct ASN1_ENCODING_st\r
-       {\r
-       unsigned char *enc;     /* DER encoding */\r
-       long len;               /* Length of encoding */\r
-       int modified;            /* set to 1 if 'enc' is invalid */\r
-       } ASN1_ENCODING;\r
+typedef struct ASN1_ENCODING_st {\r
+    unsigned char *enc;         /* DER encoding */\r
+    long len;                   /* Length of encoding */\r
+    int modified;               /* set to 1 if 'enc' is invalid */\r
+} ASN1_ENCODING;\r
 \r
 /* Used with ASN1 LONG type: if a long is set to this it is omitted */\r
-#define ASN1_LONG_UNDEF        0x7fffffffL\r
+# define ASN1_LONG_UNDEF 0x7fffffffL\r
 \r
-#define STABLE_FLAGS_MALLOC    0x01\r
-#define STABLE_NO_MASK         0x02\r
-#define DIRSTRING_TYPE \\r
+# define STABLE_FLAGS_MALLOC     0x01\r
+# define STABLE_NO_MASK          0x02\r
+# define DIRSTRING_TYPE  \\r
  (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)\r
-#define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)\r
+# define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)\r
 \r
 typedef struct asn1_string_table_st {\r
-       int nid;\r
-       long minsize;\r
-       long maxsize;\r
-       unsigned long mask;\r
-       unsigned long flags;\r
+    int nid;\r
+    long minsize;\r
+    long maxsize;\r
+    unsigned long mask;\r
+    unsigned long flags;\r
 } ASN1_STRING_TABLE;\r
 \r
 DECLARE_STACK_OF(ASN1_STRING_TABLE)\r
 \r
 /* size limits: this stuff is taken straight from RFC2459 */\r
 \r
-#define ub_name                                32768\r
-#define ub_common_name                 64\r
-#define ub_locality_name               128\r
-#define ub_state_name                  128\r
-#define ub_organization_name           64\r
-#define ub_organization_unit_name      64\r
-#define ub_title                       64\r
-#define ub_email_address               128\r
-\r
-/* Declarations for template structures: for full definitions\r
- * see asn1t.h\r
+# define ub_name                         32768\r
+# define ub_common_name                  64\r
+# define ub_locality_name                128\r
+# define ub_state_name                   128\r
+# define ub_organization_name            64\r
+# define ub_organization_unit_name       64\r
+# define ub_title                        64\r
+# define ub_email_address                128\r
+\r
+/*\r
+ * Declarations for template structures: for full definitions see asn1t.h\r
  */\r
 typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;\r
 typedef struct ASN1_TLC_st ASN1_TLC;\r
@@ -299,69 +300,70 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
 \r
 /* Declare ASN1 functions: the implement macro in in asn1t.h */\r
 \r
-#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)\r
+# define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)\r
 \r
-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \\r
-       DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)\r
+# define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \\r
+        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)\r
 \r
-#define DECLARE_ASN1_FUNCTIONS_name(type, name) \\r
-       DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
-       DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)\r
+# define DECLARE_ASN1_FUNCTIONS_name(type, name) \\r
+        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
+        DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)\r
 \r
-#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \\r
-       DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
-       DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)\r
+# define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \\r
+        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
+        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)\r
 \r
-#define        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \\r
-       type *d2i_##name(type **a, const unsigned char **in, long len); \\r
-       int i2d_##name(type *a, unsigned char **out); \\r
-       DECLARE_ASN1_ITEM(itname)\r
+# define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \\r
+        type *d2i_##name(type **a, const unsigned char **in, long len); \\r
+        int i2d_##name(type *a, unsigned char **out); \\r
+        DECLARE_ASN1_ITEM(itname)\r
 \r
-#define        DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \\r
-       type *d2i_##name(type **a, const unsigned char **in, long len); \\r
-       int i2d_##name(const type *a, unsigned char **out); \\r
-       DECLARE_ASN1_ITEM(name)\r
+# define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \\r
+        type *d2i_##name(type **a, const unsigned char **in, long len); \\r
+        int i2d_##name(const type *a, unsigned char **out); \\r
+        DECLARE_ASN1_ITEM(name)\r
 \r
-#define        DECLARE_ASN1_NDEF_FUNCTION(name) \\r
-       int i2d_##name##_NDEF(name *a, unsigned char **out);\r
+# define DECLARE_ASN1_NDEF_FUNCTION(name) \\r
+        int i2d_##name##_NDEF(name *a, unsigned char **out);\r
 \r
-#define DECLARE_ASN1_FUNCTIONS_const(name) \\r
-       DECLARE_ASN1_ALLOC_FUNCTIONS(name) \\r
-       DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)\r
+# define DECLARE_ASN1_FUNCTIONS_const(name) \\r
+        DECLARE_ASN1_ALLOC_FUNCTIONS(name) \\r
+        DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)\r
 \r
-#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
-       type *name##_new(void); \\r
-       void name##_free(type *a);\r
+# define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \\r
+        type *name##_new(void); \\r
+        void name##_free(type *a);\r
 \r
-#define DECLARE_ASN1_PRINT_FUNCTION(stname) \\r
-       DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)\r
+# define DECLARE_ASN1_PRINT_FUNCTION(stname) \\r
+        DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)\r
 \r
-#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \\r
-       int fname##_print_ctx(BIO *out, stname *x, int indent, \\r
-                                        const ASN1_PCTX *pctx);\r
+# define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \\r
+        int fname##_print_ctx(BIO *out, stname *x, int indent, \\r
+                                         const ASN1_PCTX *pctx);\r
 \r
-#define D2I_OF(type) type *(*)(type **,const unsigned char **,long)\r
-#define I2D_OF(type) int (*)(type *,unsigned char **)\r
-#define I2D_OF_const(type) int (*)(const type *,unsigned char **)\r
+# define D2I_OF(type) type *(*)(type **,const unsigned char **,long)\r
+# define I2D_OF(type) int (*)(type *,unsigned char **)\r
+# define I2D_OF_const(type) int (*)(const type *,unsigned char **)\r
 \r
-#define CHECKED_D2I_OF(type, d2i) \\r
+# define CHECKED_D2I_OF(type, d2i) \\r
     ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))\r
-#define CHECKED_I2D_OF(type, i2d) \\r
+# define CHECKED_I2D_OF(type, i2d) \\r
     ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))\r
-#define CHECKED_NEW_OF(type, xnew) \\r
+# define CHECKED_NEW_OF(type, xnew) \\r
     ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))\r
-#define CHECKED_PTR_OF(type, p) \\r
+# define CHECKED_PTR_OF(type, p) \\r
     ((void*) (1 ? p : (type*)0))\r
-#define CHECKED_PPTR_OF(type, p) \\r
+# define CHECKED_PPTR_OF(type, p) \\r
     ((void**) (1 ? p : (type**)0))\r
 \r
-#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)\r
-#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)\r
-#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)\r
+# define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)\r
+# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)\r
+# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)\r
 \r
 TYPEDEF_D2I2D_OF(void);\r
 \r
-/* The following macros and typedefs allow an ASN1_ITEM\r
+/*-\r
+ * The following macros and typedefs allow an ASN1_ITEM\r
  * to be embedded in a structure and referenced. Since\r
  * the ASN1_ITEM pointers need to be globally accessible\r
  * (possibly from shared libraries) they may exist in\r
@@ -396,157 +398,159 @@ TYPEDEF_D2I2D_OF(void);
  *\r
  */\r
 \r
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION\r
+# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION\r
 \r
 /* ASN1_ITEM pointer exported type */\r
 typedef const ASN1_ITEM ASN1_ITEM_EXP;\r
 \r
 /* Macro to obtain ASN1_ITEM pointer from exported type */\r
-#define ASN1_ITEM_ptr(iptr) (iptr)\r
+#  define ASN1_ITEM_ptr(iptr) (iptr)\r
 \r
 /* Macro to include ASN1_ITEM pointer from base type */\r
-#define ASN1_ITEM_ref(iptr) (&(iptr##_it))\r
+#  define ASN1_ITEM_ref(iptr) (&(iptr##_it))\r
 \r
-#define ASN1_ITEM_rptr(ref) (&(ref##_it))\r
+#  define ASN1_ITEM_rptr(ref) (&(ref##_it))\r
 \r
-#define DECLARE_ASN1_ITEM(name) \\r
-       OPENSSL_EXTERN const ASN1_ITEM name##_it;\r
+#  define DECLARE_ASN1_ITEM(name) \\r
+        OPENSSL_EXTERN const ASN1_ITEM name##_it;\r
 \r
-#else\r
+# else\r
 \r
-/* Platforms that can't easily handle shared global variables are declared\r
- * as functions returning ASN1_ITEM pointers.\r
+/*\r
+ * Platforms that can't easily handle shared global variables are declared as\r
+ * functions returning ASN1_ITEM pointers.\r
  */\r
 \r
 /* ASN1_ITEM pointer exported type */\r
-typedef const ASN1_ITEM * ASN1_ITEM_EXP(void);\r
+typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);\r
 \r
 /* Macro to obtain ASN1_ITEM pointer from exported type */\r
-#define ASN1_ITEM_ptr(iptr) (iptr())\r
+#  define ASN1_ITEM_ptr(iptr) (iptr())\r
 \r
 /* Macro to include ASN1_ITEM pointer from base type */\r
-#define ASN1_ITEM_ref(iptr) (iptr##_it)\r
+#  define ASN1_ITEM_ref(iptr) (iptr##_it)\r
 \r
-#define ASN1_ITEM_rptr(ref) (ref##_it())\r
+#  define ASN1_ITEM_rptr(ref) (ref##_it())\r
 \r
-#define DECLARE_ASN1_ITEM(name) \\r
-       const ASN1_ITEM * name##_it(void);\r
+#  define DECLARE_ASN1_ITEM(name) \\r
+        const ASN1_ITEM * name##_it(void);\r
 \r
-#endif\r
+# endif\r
 \r
 /* Parameters used by ASN1_STRING_print_ex() */\r
 \r
-/* These determine which characters to escape:\r
- * RFC2253 special characters, control characters and\r
- * MSB set characters\r
+/*\r
+ * These determine which characters to escape: RFC2253 special characters,\r
+ * control characters and MSB set characters\r
  */\r
 \r
-#define ASN1_STRFLGS_ESC_2253          1\r
-#define ASN1_STRFLGS_ESC_CTRL          2\r
-#define ASN1_STRFLGS_ESC_MSB           4\r
-\r
+# define ASN1_STRFLGS_ESC_2253           1\r
+# define ASN1_STRFLGS_ESC_CTRL           2\r
+# define ASN1_STRFLGS_ESC_MSB            4\r
 \r
-/* This flag determines how we do escaping: normally\r
- * RC2253 backslash only, set this to use backslash and\r
- * quote.\r
+/*\r
+ * This flag determines how we do escaping: normally RC2253 backslash only,\r
+ * set this to use backslash and quote.\r
  */\r
 \r
-#define ASN1_STRFLGS_ESC_QUOTE         8\r
-\r
+# define ASN1_STRFLGS_ESC_QUOTE          8\r
 \r
 /* These three flags are internal use only. */\r
 \r
 /* Character is a valid PrintableString character */\r
-#define CHARTYPE_PRINTABLESTRING       0x10\r
+# define CHARTYPE_PRINTABLESTRING        0x10\r
 /* Character needs escaping if it is the first character */\r
-#define CHARTYPE_FIRST_ESC_2253                0x20\r
+# define CHARTYPE_FIRST_ESC_2253         0x20\r
 /* Character needs escaping if it is the last character */\r
-#define CHARTYPE_LAST_ESC_2253         0x40\r
+# define CHARTYPE_LAST_ESC_2253          0x40\r
 \r
-/* NB the internal flags are safely reused below by flags\r
- * handled at the top level.\r
+/*\r
+ * NB the internal flags are safely reused below by flags handled at the top\r
+ * level.\r
  */\r
 \r
-/* If this is set we convert all character strings\r
- * to UTF8 first\r
+/*\r
+ * If this is set we convert all character strings to UTF8 first\r
  */\r
 \r
-#define ASN1_STRFLGS_UTF8_CONVERT      0x10\r
+# define ASN1_STRFLGS_UTF8_CONVERT       0x10\r
 \r
-/* If this is set we don't attempt to interpret content:\r
- * just assume all strings are 1 byte per character. This\r
- * will produce some pretty odd looking output!\r
+/*\r
+ * If this is set we don't attempt to interpret content: just assume all\r
+ * strings are 1 byte per character. This will produce some pretty odd\r
+ * looking output!\r
  */\r
 \r
-#define ASN1_STRFLGS_IGNORE_TYPE       0x20\r
+# define ASN1_STRFLGS_IGNORE_TYPE        0x20\r
 \r
 /* If this is set we include the string type in the output */\r
-#define ASN1_STRFLGS_SHOW_TYPE         0x40\r
-\r
-/* This determines which strings to display and which to\r
- * 'dump' (hex dump of content octets or DER encoding). We can\r
- * only dump non character strings or everything. If we\r
- * don't dump 'unknown' they are interpreted as character\r
- * strings with 1 octet per character and are subject to\r
- * the usual escaping options.\r
+# define ASN1_STRFLGS_SHOW_TYPE          0x40\r
+\r
+/*\r
+ * This determines which strings to display and which to 'dump' (hex dump of\r
+ * content octets or DER encoding). We can only dump non character strings or\r
+ * everything. If we don't dump 'unknown' they are interpreted as character\r
+ * strings with 1 octet per character and are subject to the usual escaping\r
+ * options.\r
  */\r
 \r
-#define ASN1_STRFLGS_DUMP_ALL          0x80\r
-#define ASN1_STRFLGS_DUMP_UNKNOWN      0x100\r
+# define ASN1_STRFLGS_DUMP_ALL           0x80\r
+# define ASN1_STRFLGS_DUMP_UNKNOWN       0x100\r
 \r
-/* These determine what 'dumping' does, we can dump the\r
- * content octets or the DER encoding: both use the\r
- * RFC2253 #XXXXX notation.\r
+/*\r
+ * These determine what 'dumping' does, we can dump the content octets or the\r
+ * DER encoding: both use the RFC2253 #XXXXX notation.\r
  */\r
 \r
-#define ASN1_STRFLGS_DUMP_DER          0x200\r
+# define ASN1_STRFLGS_DUMP_DER           0x200\r
 \r
-/* All the string flags consistent with RFC2253,\r
- * escaping control characters isn't essential in\r
- * RFC2253 but it is advisable anyway.\r
+/*\r
+ * All the string flags consistent with RFC2253, escaping control characters\r
+ * isn't essential in RFC2253 but it is advisable anyway.\r
  */\r
 \r
-#define ASN1_STRFLGS_RFC2253   (ASN1_STRFLGS_ESC_2253 | \\r
-                               ASN1_STRFLGS_ESC_CTRL | \\r
-                               ASN1_STRFLGS_ESC_MSB | \\r
-                               ASN1_STRFLGS_UTF8_CONVERT | \\r
-                               ASN1_STRFLGS_DUMP_UNKNOWN | \\r
-                               ASN1_STRFLGS_DUMP_DER)\r
+# define ASN1_STRFLGS_RFC2253    (ASN1_STRFLGS_ESC_2253 | \\r
+                                ASN1_STRFLGS_ESC_CTRL | \\r
+                                ASN1_STRFLGS_ESC_MSB | \\r
+                                ASN1_STRFLGS_UTF8_CONVERT | \\r
+                                ASN1_STRFLGS_DUMP_UNKNOWN | \\r
+                                ASN1_STRFLGS_DUMP_DER)\r
 \r
 DECLARE_STACK_OF(ASN1_INTEGER)\r
 DECLARE_ASN1_SET_OF(ASN1_INTEGER)\r
 \r
 DECLARE_STACK_OF(ASN1_GENERALSTRING)\r
 \r
-typedef struct asn1_type_st\r
-       {\r
-       int type;\r
-       union   {\r
-               char *ptr;\r
-               ASN1_BOOLEAN            boolean;\r
-               ASN1_STRING *           asn1_string;\r
-               ASN1_OBJECT *           object;\r
-               ASN1_INTEGER *          integer;\r
-               ASN1_ENUMERATED *       enumerated;\r
-               ASN1_BIT_STRING *       bit_string;\r
-               ASN1_OCTET_STRING *     octet_string;\r
-               ASN1_PRINTABLESTRING *  printablestring;\r
-               ASN1_T61STRING *        t61string;\r
-               ASN1_IA5STRING *        ia5string;\r
-               ASN1_GENERALSTRING *    generalstring;\r
-               ASN1_BMPSTRING *        bmpstring;\r
-               ASN1_UNIVERSALSTRING *  universalstring;\r
-               ASN1_UTCTIME *          utctime;\r
-               ASN1_GENERALIZEDTIME *  generalizedtime;\r
-               ASN1_VISIBLESTRING *    visiblestring;\r
-               ASN1_UTF8STRING *       utf8string;\r
-               /* set and sequence are left complete and still\r
-                * contain the set or sequence bytes */\r
-               ASN1_STRING *           set;\r
-               ASN1_STRING *           sequence;\r
-               ASN1_VALUE *            asn1_value;\r
-               } value;\r
-       } ASN1_TYPE;\r
+typedef struct asn1_type_st {\r
+    int type;\r
+    union {\r
+        char *ptr;\r
+        ASN1_BOOLEAN boolean;\r
+        ASN1_STRING *asn1_string;\r
+        ASN1_OBJECT *object;\r
+        ASN1_INTEGER *integer;\r
+        ASN1_ENUMERATED *enumerated;\r
+        ASN1_BIT_STRING *bit_string;\r
+        ASN1_OCTET_STRING *octet_string;\r
+        ASN1_PRINTABLESTRING *printablestring;\r
+        ASN1_T61STRING *t61string;\r
+        ASN1_IA5STRING *ia5string;\r
+        ASN1_GENERALSTRING *generalstring;\r
+        ASN1_BMPSTRING *bmpstring;\r
+        ASN1_UNIVERSALSTRING *universalstring;\r
+        ASN1_UTCTIME *utctime;\r
+        ASN1_GENERALIZEDTIME *generalizedtime;\r
+        ASN1_VISIBLESTRING *visiblestring;\r
+        ASN1_UTF8STRING *utf8string;\r
+        /*\r
+         * set and sequence are left complete and still contain the set or\r
+         * sequence bytes\r
+         */\r
+        ASN1_STRING *set;\r
+        ASN1_STRING *sequence;\r
+        ASN1_VALUE *asn1_value;\r
+    } value;\r
+} ASN1_TYPE;\r
 \r
 DECLARE_STACK_OF(ASN1_TYPE)\r
 DECLARE_ASN1_SET_OF(ASN1_TYPE)\r
@@ -556,309 +560,315 @@ typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)\r
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)\r
 \r
-typedef struct NETSCAPE_X509_st\r
-       {\r
-       ASN1_OCTET_STRING *header;\r
-       X509 *cert;\r
-       } NETSCAPE_X509;\r
+typedef struct NETSCAPE_X509_st {\r
+    ASN1_OCTET_STRING *header;\r
+    X509 *cert;\r
+} NETSCAPE_X509;\r
 \r
 /* This is used to contain a list of bit names */\r
 typedef struct BIT_STRING_BITNAME_st {\r
-       int bitnum;\r
-       const char *lname;\r
-       const char *sname;\r
+    int bitnum;\r
+    const char *lname;\r
+    const char *sname;\r
 } BIT_STRING_BITNAME;\r
 \r
-\r
-#define M_ASN1_STRING_length(x)        ((x)->length)\r
-#define M_ASN1_STRING_length_set(x, n) ((x)->length = (n))\r
-#define M_ASN1_STRING_type(x)  ((x)->type)\r
-#define M_ASN1_STRING_data(x)  ((x)->data)\r
+# define M_ASN1_STRING_length(x) ((x)->length)\r
+# define M_ASN1_STRING_length_set(x, n)  ((x)->length = (n))\r
+# define M_ASN1_STRING_type(x)   ((x)->type)\r
+# define M_ASN1_STRING_data(x)   ((x)->data)\r
 \r
 /* Macros for string operations */\r
-#define M_ASN1_BIT_STRING_new()        (ASN1_BIT_STRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_BIT_STRING)\r
-#define M_ASN1_BIT_STRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\\r
-               ASN1_STRING_dup((const ASN1_STRING *)a)\r
-#define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\\r
-               (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
-#define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)\r
-\r
-#define M_ASN1_INTEGER_new()   (ASN1_INTEGER *)\\r
-               ASN1_STRING_type_new(V_ASN1_INTEGER)\r
-#define M_ASN1_INTEGER_free(a)         ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\\r
-               ASN1_STRING_dup((const ASN1_STRING *)a)\r
-#define M_ASN1_INTEGER_cmp(a,b)        ASN1_STRING_cmp(\\r
-               (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
-\r
-#define M_ASN1_ENUMERATED_new()        (ASN1_ENUMERATED *)\\r
-               ASN1_STRING_type_new(V_ASN1_ENUMERATED)\r
-#define M_ASN1_ENUMERATED_free(a)      ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\\r
-               ASN1_STRING_dup((const ASN1_STRING *)a)\r
-#define M_ASN1_ENUMERATED_cmp(a,b)     ASN1_STRING_cmp(\\r
-               (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
-\r
-#define M_ASN1_OCTET_STRING_new()      (ASN1_OCTET_STRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_OCTET_STRING)\r
-#define M_ASN1_OCTET_STRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\\r
-               ASN1_STRING_dup((const ASN1_STRING *)a)\r
-#define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\\r
-               (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
-#define M_ASN1_OCTET_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)\r
-#define M_ASN1_OCTET_STRING_print(a,b) ASN1_STRING_print(a,(ASN1_STRING *)b)\r
-#define M_i2d_ASN1_OCTET_STRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\\r
-               V_ASN1_UNIVERSAL)\r
-\r
-#define B_ASN1_TIME \\r
-                       B_ASN1_UTCTIME | \\r
-                       B_ASN1_GENERALIZEDTIME\r
-\r
-#define B_ASN1_PRINTABLE \\r
-                       B_ASN1_NUMERICSTRING| \\r
-                       B_ASN1_PRINTABLESTRING| \\r
-                       B_ASN1_T61STRING| \\r
-                       B_ASN1_IA5STRING| \\r
-                       B_ASN1_BIT_STRING| \\r
-                       B_ASN1_UNIVERSALSTRING|\\r
-                       B_ASN1_BMPSTRING|\\r
-                       B_ASN1_UTF8STRING|\\r
-                       B_ASN1_SEQUENCE|\\r
-                       B_ASN1_UNKNOWN\r
-\r
-#define B_ASN1_DIRECTORYSTRING \\r
-                       B_ASN1_PRINTABLESTRING| \\r
-                       B_ASN1_TELETEXSTRING|\\r
-                       B_ASN1_BMPSTRING|\\r
-                       B_ASN1_UNIVERSALSTRING|\\r
-                       B_ASN1_UTF8STRING\r
-\r
-#define B_ASN1_DISPLAYTEXT \\r
-                       B_ASN1_IA5STRING| \\r
-                       B_ASN1_VISIBLESTRING| \\r
-                       B_ASN1_BMPSTRING|\\r
-                       B_ASN1_UTF8STRING\r
-\r
-#define M_ASN1_PRINTABLE_new() ASN1_STRING_type_new(V_ASN1_T61STRING)\r
-#define M_ASN1_PRINTABLE_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
-               pp,a->type,V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_PRINTABLE(a,pp,l) \\r
-               d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
-                       B_ASN1_PRINTABLE)\r
-\r
-#define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)\r
-#define M_DIRECTORYSTRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
-                                               pp,a->type,V_ASN1_UNIVERSAL)\r
-#define M_d2i_DIRECTORYSTRING(a,pp,l) \\r
-               d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
-                       B_ASN1_DIRECTORYSTRING)\r
-\r
-#define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)\r
-#define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
-                                               pp,a->type,V_ASN1_UNIVERSAL)\r
-#define M_d2i_DISPLAYTEXT(a,pp,l) \\r
-               d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
-                       B_ASN1_DISPLAYTEXT)\r
-\r
-#define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)\r
-#define M_ASN1_PRINTABLESTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\\r
-               V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \\r
-               (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)\r
-\r
-#define M_ASN1_T61STRING_new() (ASN1_T61STRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_T61STRING)\r
-#define M_ASN1_T61STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_T61STRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\\r
-               V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_T61STRING(a,pp,l) \\r
-               (ASN1_T61STRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)\r
-\r
-#define M_ASN1_IA5STRING_new() (ASN1_IA5STRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_IA5STRING)\r
-#define M_ASN1_IA5STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_IA5STRING_dup(a)        \\r
-               (ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)\r
-#define M_i2d_ASN1_IA5STRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_IA5STRING(a,pp,l) \\r
-               (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\\r
-                       B_ASN1_IA5STRING)\r
-\r
-#define M_ASN1_UTCTIME_new()   (ASN1_UTCTIME *)\\r
-               ASN1_STRING_type_new(V_ASN1_UTCTIME)\r
-#define M_ASN1_UTCTIME_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\\r
-               ASN1_STRING_dup((const ASN1_STRING *)a)\r
-\r
-#define M_ASN1_GENERALIZEDTIME_new()   (ASN1_GENERALIZEDTIME *)\\r
-               ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)\r
-#define M_ASN1_GENERALIZEDTIME_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\\r
-       (const ASN1_STRING *)a)\r
-\r
-#define M_ASN1_TIME_new()      (ASN1_TIME *)\\r
-               ASN1_STRING_type_new(V_ASN1_UTCTIME)\r
-#define M_ASN1_TIME_free(a)    ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_ASN1_TIME_dup(a) (ASN1_TIME *)\\r
-       ASN1_STRING_dup((const ASN1_STRING *)a)\r
-\r
-#define M_ASN1_GENERALSTRING_new()     (ASN1_GENERALSTRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_GENERALSTRING)\r
-#define M_ASN1_GENERALSTRING_free(a)   ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_GENERALSTRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \\r
-               (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)\r
-\r
-#define M_ASN1_UNIVERSALSTRING_new()   (ASN1_UNIVERSALSTRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)\r
-#define M_ASN1_UNIVERSALSTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \\r
-               (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)\r
-\r
-#define M_ASN1_BMPSTRING_new() (ASN1_BMPSTRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_BMPSTRING)\r
-#define M_ASN1_BMPSTRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_BMPSTRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_BMPSTRING(a,pp,l) \\r
-               (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)\r
-\r
-#define M_ASN1_VISIBLESTRING_new()     (ASN1_VISIBLESTRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)\r
-#define M_ASN1_VISIBLESTRING_free(a)   ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_VISIBLESTRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \\r
-               (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)\r
-\r
-#define M_ASN1_UTF8STRING_new()        (ASN1_UTF8STRING *)\\r
-               ASN1_STRING_type_new(V_ASN1_UTF8STRING)\r
-#define M_ASN1_UTF8STRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)\r
-#define M_i2d_ASN1_UTF8STRING(a,pp) \\r
-               i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\\r
-                       V_ASN1_UNIVERSAL)\r
-#define M_d2i_ASN1_UTF8STRING(a,pp,l) \\r
-               (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\\r
-               ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)\r
+# define M_ASN1_BIT_STRING_new() (ASN1_BIT_STRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_BIT_STRING)\r
+# define M_ASN1_BIT_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\\r
+                ASN1_STRING_dup((const ASN1_STRING *)a)\r
+# define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\\r
+                (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
+# define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)\r
+\r
+# define M_ASN1_INTEGER_new()    (ASN1_INTEGER *)\\r
+                ASN1_STRING_type_new(V_ASN1_INTEGER)\r
+# define M_ASN1_INTEGER_free(a)          ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\\r
+                ASN1_STRING_dup((const ASN1_STRING *)a)\r
+# define M_ASN1_INTEGER_cmp(a,b) ASN1_STRING_cmp(\\r
+                (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
+\r
+# define M_ASN1_ENUMERATED_new() (ASN1_ENUMERATED *)\\r
+                ASN1_STRING_type_new(V_ASN1_ENUMERATED)\r
+# define M_ASN1_ENUMERATED_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\\r
+                ASN1_STRING_dup((const ASN1_STRING *)a)\r
+# define M_ASN1_ENUMERATED_cmp(a,b)      ASN1_STRING_cmp(\\r
+                (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
+\r
+# define M_ASN1_OCTET_STRING_new()       (ASN1_OCTET_STRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_OCTET_STRING)\r
+# define M_ASN1_OCTET_STRING_free(a)     ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\\r
+                ASN1_STRING_dup((const ASN1_STRING *)a)\r
+# define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\\r
+                (const ASN1_STRING *)a,(const ASN1_STRING *)b)\r
+# define M_ASN1_OCTET_STRING_set(a,b,c)  ASN1_STRING_set((ASN1_STRING *)a,b,c)\r
+# define M_ASN1_OCTET_STRING_print(a,b)  ASN1_STRING_print(a,(ASN1_STRING *)b)\r
+# define M_i2d_ASN1_OCTET_STRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\\r
+                V_ASN1_UNIVERSAL)\r
+\r
+# define B_ASN1_TIME \\r
+                        B_ASN1_UTCTIME | \\r
+                        B_ASN1_GENERALIZEDTIME\r
+\r
+# define B_ASN1_PRINTABLE \\r
+                        B_ASN1_NUMERICSTRING| \\r
+                        B_ASN1_PRINTABLESTRING| \\r
+                        B_ASN1_T61STRING| \\r
+                        B_ASN1_IA5STRING| \\r
+                        B_ASN1_BIT_STRING| \\r
+                        B_ASN1_UNIVERSALSTRING|\\r
+                        B_ASN1_BMPSTRING|\\r
+                        B_ASN1_UTF8STRING|\\r
+                        B_ASN1_SEQUENCE|\\r
+                        B_ASN1_UNKNOWN\r
+\r
+# define B_ASN1_DIRECTORYSTRING \\r
+                        B_ASN1_PRINTABLESTRING| \\r
+                        B_ASN1_TELETEXSTRING|\\r
+                        B_ASN1_BMPSTRING|\\r
+                        B_ASN1_UNIVERSALSTRING|\\r
+                        B_ASN1_UTF8STRING\r
+\r
+# define B_ASN1_DISPLAYTEXT \\r
+                        B_ASN1_IA5STRING| \\r
+                        B_ASN1_VISIBLESTRING| \\r
+                        B_ASN1_BMPSTRING|\\r
+                        B_ASN1_UTF8STRING\r
+\r
+# define M_ASN1_PRINTABLE_new()  ASN1_STRING_type_new(V_ASN1_T61STRING)\r
+# define M_ASN1_PRINTABLE_free(a)        ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
+                pp,a->type,V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_PRINTABLE(a,pp,l) \\r
+                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
+                        B_ASN1_PRINTABLE)\r
+\r
+# define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)\r
+# define M_DIRECTORYSTRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
+                                                pp,a->type,V_ASN1_UNIVERSAL)\r
+# define M_d2i_DIRECTORYSTRING(a,pp,l) \\r
+                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
+                        B_ASN1_DIRECTORYSTRING)\r
+\r
+# define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)\r
+# define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\\r
+                                                pp,a->type,V_ASN1_UNIVERSAL)\r
+# define M_d2i_DISPLAYTEXT(a,pp,l) \\r
+                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \\r
+                        B_ASN1_DISPLAYTEXT)\r
+\r
+# define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)\r
+# define M_ASN1_PRINTABLESTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_PRINTABLESTRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\\r
+                V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \\r
+                (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)\r
+\r
+# define M_ASN1_T61STRING_new()  (ASN1_T61STRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_T61STRING)\r
+# define M_ASN1_T61STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_T61STRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\\r
+                V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_T61STRING(a,pp,l) \\r
+                (ASN1_T61STRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)\r
+\r
+# define M_ASN1_IA5STRING_new()  (ASN1_IA5STRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_IA5STRING)\r
+# define M_ASN1_IA5STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_IA5STRING_dup(a) \\r
+                (ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)\r
+# define M_i2d_ASN1_IA5STRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_IA5STRING(a,pp,l) \\r
+                (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\\r
+                        B_ASN1_IA5STRING)\r
+\r
+# define M_ASN1_UTCTIME_new()    (ASN1_UTCTIME *)\\r
+                ASN1_STRING_type_new(V_ASN1_UTCTIME)\r
+# define M_ASN1_UTCTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\\r
+                ASN1_STRING_dup((const ASN1_STRING *)a)\r
+\r
+# define M_ASN1_GENERALIZEDTIME_new()    (ASN1_GENERALIZEDTIME *)\\r
+                ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)\r
+# define M_ASN1_GENERALIZEDTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\\r
+        (const ASN1_STRING *)a)\r
+\r
+# define M_ASN1_TIME_new()       (ASN1_TIME *)\\r
+                ASN1_STRING_type_new(V_ASN1_UTCTIME)\r
+# define M_ASN1_TIME_free(a)     ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_ASN1_TIME_dup(a) (ASN1_TIME *)\\r
+        ASN1_STRING_dup((const ASN1_STRING *)a)\r
+\r
+# define M_ASN1_GENERALSTRING_new()      (ASN1_GENERALSTRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_GENERALSTRING)\r
+# define M_ASN1_GENERALSTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_GENERALSTRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_GENERALSTRING(a,pp,l) \\r
+                (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)\r
+\r
+# define M_ASN1_UNIVERSALSTRING_new()    (ASN1_UNIVERSALSTRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)\r
+# define M_ASN1_UNIVERSALSTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \\r
+                (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)\r
+\r
+# define M_ASN1_BMPSTRING_new()  (ASN1_BMPSTRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_BMPSTRING)\r
+# define M_ASN1_BMPSTRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_BMPSTRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_BMPSTRING(a,pp,l) \\r
+                (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)\r
+\r
+# define M_ASN1_VISIBLESTRING_new()      (ASN1_VISIBLESTRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)\r
+# define M_ASN1_VISIBLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_VISIBLESTRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \\r
+                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)\r
+\r
+# define M_ASN1_UTF8STRING_new() (ASN1_UTF8STRING *)\\r
+                ASN1_STRING_type_new(V_ASN1_UTF8STRING)\r
+# define M_ASN1_UTF8STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)\r
+# define M_i2d_ASN1_UTF8STRING(a,pp) \\r
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\\r
+                        V_ASN1_UNIVERSAL)\r
+# define M_d2i_ASN1_UTF8STRING(a,pp,l) \\r
+                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\\r
+                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)\r
 \r
   /* for the is_set parameter to i2d_ASN1_SET */\r
-#define IS_SEQUENCE    0\r
-#define IS_SET         1\r
+# define IS_SEQUENCE     0\r
+# define IS_SET          1\r
 \r
 DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)\r
 \r
 int ASN1_TYPE_get(ASN1_TYPE *a);\r
 void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);\r
 int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);\r
-int            ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);\r
+int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);\r
 \r
-ASN1_OBJECT *  ASN1_OBJECT_new(void );\r
-void           ASN1_OBJECT_free(ASN1_OBJECT *a);\r
-int            i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);\r
-ASN1_OBJECT *  c2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,\r
-                       long length);\r
-ASN1_OBJECT *  d2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,\r
-                       long length);\r
+ASN1_OBJECT *ASN1_OBJECT_new(void);\r
+void ASN1_OBJECT_free(ASN1_OBJECT *a);\r
+int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);\r
+ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,\r
+                             long length);\r
+ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,\r
+                             long length);\r
 \r
 DECLARE_ASN1_ITEM(ASN1_OBJECT)\r
 \r
 DECLARE_STACK_OF(ASN1_OBJECT)\r
 DECLARE_ASN1_SET_OF(ASN1_OBJECT)\r
 \r
-ASN1_STRING *  ASN1_STRING_new(void);\r
-void           ASN1_STRING_free(ASN1_STRING *a);\r
-int            ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);\r
-ASN1_STRING *  ASN1_STRING_dup(const ASN1_STRING *a);\r
-ASN1_STRING *  ASN1_STRING_type_new(int type );\r
-int            ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);\r
-  /* Since this is used to store all sorts of things, via macros, for now, make\r
-     its data void * */\r
-int            ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);\r
-void           ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);\r
+ASN1_STRING *ASN1_STRING_new(void);\r
+void ASN1_STRING_free(ASN1_STRING *a);\r
+void ASN1_STRING_clear_free(ASN1_STRING *a);\r
+int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);\r
+ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);\r
+ASN1_STRING *ASN1_STRING_type_new(int type);\r
+int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);\r
+  /*\r
+   * Since this is used to store all sorts of things, via macros, for now,\r
+   * make its data void *\r
+   */\r
+int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);\r
+void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);\r
 int ASN1_STRING_length(const ASN1_STRING *x);\r
 void ASN1_STRING_length_set(ASN1_STRING *x, int n);\r
 int ASN1_STRING_type(ASN1_STRING *x);\r
-unsigned char * ASN1_STRING_data(ASN1_STRING *x);\r
+unsigned char *ASN1_STRING_data(ASN1_STRING *x);\r
 \r
 DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)\r
-int            i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);\r
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,const unsigned char **pp,\r
-                       long length);\r
-int            ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d,\r
-                       int length );\r
-int            ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);\r
-int            ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);\r
-int            ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,\r
-                                     unsigned char *flags, int flags_len);\r
-\r
-#ifndef OPENSSL_NO_BIO\r
+int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);\r
+ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,\r
+                                     const unsigned char **pp, long length);\r
+int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);\r
+int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);\r
+int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);\r
+int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,\r
+                          unsigned char *flags, int flags_len);\r
+\r
+# ifndef OPENSSL_NO_BIO\r
 int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,\r
-                               BIT_STRING_BITNAME *tbl, int indent);\r
-#endif\r
+                               BIT_STRING_BITNAME *tbl, int indent);\r
+# endif\r
 int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);\r
 int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,\r
-                               BIT_STRING_BITNAME *tbl);\r
+                            BIT_STRING_BITNAME *tbl);\r
 \r
-int            i2d_ASN1_BOOLEAN(int a,unsigned char **pp);\r
-int            d2i_ASN1_BOOLEAN(int *a,const unsigned char **pp,long length);\r
+int i2d_ASN1_BOOLEAN(int a, unsigned char **pp);\r
+int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length);\r
 \r
 DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)\r
-int            i2c_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);\r
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a,const unsigned char **pp,\r
-                       long length);\r
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,const unsigned char **pp,\r
-                       long length);\r
-ASN1_INTEGER * ASN1_INTEGER_dup(const ASN1_INTEGER *x);\r
+int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);\r
+ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,\r
+                               long length);\r
+ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,\r
+                                long length);\r
+ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);\r
 int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);\r
 \r
 DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)\r
 \r
-int ASN1_UTCTIME_check(ASN1_UTCTIME *a);\r
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);\r
+int ASN1_UTCTIME_check(const ASN1_UTCTIME *a);\r
+ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t);\r
 ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,\r
-                               int offset_day, long offset_sec);\r
+                               int offset_day, long offset_sec);\r
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);\r
 int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);\r
-#if 0\r
+# if 0\r
 time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);\r
-#endif\r
+# endif\r
 \r
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);\r
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);\r
+int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);\r
+ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,\r
+                                               time_t t);\r
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,\r
-            time_t t, int offset_day, long offset_sec);\r
+                                               time_t t, int offset_day,\r
+                                               long offset_sec);\r
 int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);\r
+int ASN1_TIME_diff(int *pday, int *psec,\r
+                   const ASN1_TIME *from, const ASN1_TIME *to);\r
 \r
 DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)\r
-ASN1_OCTET_STRING *    ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);\r
-int    ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b);\r
-int    ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data, int len);\r
+ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);\r
+int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,\r
+                          const ASN1_OCTET_STRING *b);\r
+int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,\r
+                          int len);\r
 \r
 DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)\r
 DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)\r
@@ -883,46 +893,46 @@ DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
 \r
 DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)\r
 \r
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);\r
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s,time_t t,\r
-                               int offset_day, long offset_sec);\r
+ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);\r
+ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,\r
+                         int offset_day, long offset_sec);\r
 int ASN1_TIME_check(ASN1_TIME *t);\r
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);\r
+ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME\r
+                                                   **out);\r
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);\r
 \r
 int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,\r
-                i2d_of_void *i2d, int ex_tag, int ex_class,\r
-                int is_set);\r
+                 i2d_of_void *i2d, int ex_tag, int ex_class, int is_set);\r
 STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,\r
-                             const unsigned char **pp,\r
-                             long length, d2i_of_void *d2i,\r
-                             void (*free_func)(OPENSSL_BLOCK), int ex_tag,\r
-                             int ex_class);\r
+                                      const unsigned char **pp,\r
+                                      long length, d2i_of_void *d2i,\r
+                                      void (*free_func) (OPENSSL_BLOCK),\r
+                                      int ex_tag, int ex_class);\r
 \r
-#ifndef OPENSSL_NO_BIO\r
+# ifndef OPENSSL_NO_BIO\r
 int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);\r
-int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);\r
+int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);\r
 int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);\r
-int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int size);\r
-int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a);\r
-int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size);\r
+int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size);\r
+int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a);\r
+int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);\r
 int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);\r
-#endif\r
-int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a);\r
+# endif\r
+int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a);\r
 \r
-int a2d_ASN1_OBJECT(unsigned char *out,int olen, const char *buf, int num);\r
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,\r
-       const char *sn, const char *ln);\r
+int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);\r
+ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,\r
+                                const char *sn, const char *ln);\r
 \r
 int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);\r
 long ASN1_INTEGER_get(const ASN1_INTEGER *a);\r
 ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);\r
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai,BIGNUM *bn);\r
+BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn);\r
 \r
 int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);\r
 long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);\r
 ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);\r
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);\r
+BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn);\r
 \r
 /* General */\r
 /* given a string, return the correct type, max is the maximum length */\r
@@ -930,11 +940,11 @@ int ASN1_PRINTABLE_type(const unsigned char *s, int max);
 \r
 int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);\r
 ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,\r
-       long length, int Ptag, int Pclass);\r
+                            long length, int Ptag, int Pclass);\r
 unsigned long ASN1_tag2bit(int tag);\r
 /* type is one or more of the B_ASN1_ values. */\r
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,const unsigned char **pp,\r
-               long length,int type);\r
+ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,\r
+                                 long length, int type);\r
 \r
 /* PARSING */\r
 int asn1_Finish(ASN1_CTX *c);\r
@@ -942,84 +952,84 @@ int asn1_const_Finish(ASN1_const_CTX *c);
 \r
 /* SPECIALS */\r
 int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,\r
-       int *pclass, long omax);\r
-int ASN1_check_infinite_end(unsigned char **p,long len);\r
-int ASN1_const_check_infinite_end(const unsigned char **p,long len);\r
+                    int *pclass, long omax);\r
+int ASN1_check_infinite_end(unsigned char **p, long len);\r
+int ASN1_const_check_infinite_end(const unsigned char **p, long len);\r
 void ASN1_put_object(unsigned char **pp, int constructed, int length,\r
-       int tag, int xclass);\r
+                     int tag, int xclass);\r
 int ASN1_put_eoc(unsigned char **pp);\r
 int ASN1_object_size(int constructed, int length, int tag);\r
 \r
 /* Used to implement other functions */\r
 void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);\r
 \r
-#define ASN1_dup_of(type,i2d,d2i,x) \\r
+# define ASN1_dup_of(type,i2d,d2i,x) \\r
     ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \\r
-                    CHECKED_D2I_OF(type, d2i), \\r
-                    CHECKED_PTR_OF(type, x)))\r
+                     CHECKED_D2I_OF(type, d2i), \\r
+                     CHECKED_PTR_OF(type, x)))\r
 \r
-#define ASN1_dup_of_const(type,i2d,d2i,x) \\r
+# define ASN1_dup_of_const(type,i2d,d2i,x) \\r
     ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \\r
-                    CHECKED_D2I_OF(type, d2i), \\r
-                    CHECKED_PTR_OF(const type, x)))\r
+                     CHECKED_D2I_OF(type, d2i), \\r
+                     CHECKED_PTR_OF(const type, x)))\r
 \r
 void *ASN1_item_dup(const ASN1_ITEM *it, void *x);\r
 \r
 /* ASN1 alloc/free macros for when a type is only used internally */\r
 \r
-#define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))\r
-#define M_ASN1_free_of(x, type) \\r
-               ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))\r
+# define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))\r
+# define M_ASN1_free_of(x, type) \\r
+                ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))\r
 \r
-#ifndef OPENSSL_NO_FP_API\r
-void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);\r
+# ifndef OPENSSL_NO_FP_API\r
+void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);\r
 \r
-#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \\r
+#  define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \\r
     ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \\r
-                       CHECKED_D2I_OF(type, d2i), \\r
-                       in, \\r
-                       CHECKED_PPTR_OF(type, x)))\r
+                        CHECKED_D2I_OF(type, d2i), \\r
+                        in, \\r
+                        CHECKED_PPTR_OF(type, x)))\r
 \r
 void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);\r
-int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);\r
+int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);\r
 \r
-#define ASN1_i2d_fp_of(type,i2d,out,x) \\r
+#  define ASN1_i2d_fp_of(type,i2d,out,x) \\r
     (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \\r
-                out, \\r
-                CHECKED_PTR_OF(type, x)))\r
+                 out, \\r
+                 CHECKED_PTR_OF(type, x)))\r
 \r
-#define ASN1_i2d_fp_of_const(type,i2d,out,x) \\r
+#  define ASN1_i2d_fp_of_const(type,i2d,out,x) \\r
     (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \\r
-                out, \\r
-                CHECKED_PTR_OF(const type, x)))\r
+                 out, \\r
+                 CHECKED_PTR_OF(const type, x)))\r
 \r
 int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);\r
 int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);\r
-#endif\r
+# endif\r
 \r
 int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);\r
 \r
-#ifndef OPENSSL_NO_BIO\r
-void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);\r
+# ifndef OPENSSL_NO_BIO\r
+void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);\r
 \r
-#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \\r
+#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \\r
     ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \\r
-                         CHECKED_D2I_OF(type, d2i), \\r
-                         in, \\r
-                         CHECKED_PPTR_OF(type, x)))\r
+                          CHECKED_D2I_OF(type, d2i), \\r
+                          in, \\r
+                          CHECKED_PPTR_OF(type, x)))\r
 \r
 void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);\r
-int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);\r
+int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x);\r
 \r
-#define ASN1_i2d_bio_of(type,i2d,out,x) \\r
+#  define ASN1_i2d_bio_of(type,i2d,out,x) \\r
     (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \\r
-                 out, \\r
-                 CHECKED_PTR_OF(type, x)))\r
+                  out, \\r
+                  CHECKED_PTR_OF(type, x)))\r
 \r
-#define ASN1_i2d_bio_of_const(type,i2d,out,x) \\r
+#  define ASN1_i2d_bio_of_const(type,i2d,out,x) \\r
     (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \\r
-                 out, \\r
-                 CHECKED_PTR_OF(const type, x)))\r
+                  out, \\r
+                  CHECKED_PTR_OF(const type, x)))\r
 \r
 int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);\r
 int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);\r
@@ -1028,10 +1038,11 @@ int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
 int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);\r
 int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);\r
 int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,\r
-                               unsigned char *buf, int off);\r
-int ASN1_parse(BIO *bp,const unsigned char *pp,long len,int indent);\r
-int ASN1_parse_dump(BIO *bp,const unsigned char *pp,long len,int indent,int dump);\r
-#endif\r
+                  unsigned char *buf, int off);\r
+int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);\r
+int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,\r
+                    int dump);\r
+# endif\r
 const char *ASN1_tag2str(int tag);\r
 \r
 /* Used to load and write netscape format cert */\r
@@ -1040,42 +1051,43 @@ DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
 \r
 int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);\r
 \r
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,\r
-       unsigned char *data, int len);\r
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a,\r
-       unsigned char *data, int max_len);\r
+int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len);\r
+int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len);\r
 int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,\r
-       unsigned char *data, int len);\r
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,\r
-       unsigned char *data, int max_len);\r
+                                  unsigned char *data, int len);\r
+int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,\r
+                                  unsigned char *data, int max_len);\r
 \r
 STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,\r
-                                d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));\r
+                                         d2i_of_void *d2i,\r
+                                         void (*free_func) (OPENSSL_BLOCK));\r
 unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,\r
-                            unsigned char **buf, int *len );\r
+                             unsigned char **buf, int *len);\r
 void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);\r
 void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);\r
 ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,\r
-                             ASN1_OCTET_STRING **oct);\r
+                              ASN1_OCTET_STRING **oct);\r
 \r
-#define ASN1_pack_string_of(type,obj,i2d,oct) \\r
+# define ASN1_pack_string_of(type,obj,i2d,oct) \\r
     (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \\r
-                     CHECKED_I2D_OF(type, i2d), \\r
-                     oct))\r
+                      CHECKED_I2D_OF(type, i2d), \\r
+                      oct))\r
 \r
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);\r
+ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,\r
+                            ASN1_OCTET_STRING **oct);\r
 \r
 void ASN1_STRING_set_default_mask(unsigned long mask);\r
 int ASN1_STRING_set_default_mask_asc(const char *p);\r
 unsigned long ASN1_STRING_get_default_mask(void);\r
 int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,\r
-                                       int inform, unsigned long mask);\r
+                       int inform, unsigned long mask);\r
 int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,\r
-                                       int inform, unsigned long mask,\r
-                                       long minsize, long maxsize);\r
+                        int inform, unsigned long mask,\r
+                        long minsize, long maxsize);\r
 \r
 ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,\r
-               const unsigned char *in, int inlen, int inform, int nid);\r
+                                    const unsigned char *in, int inlen,\r
+                                    int inform, int nid);\r
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);\r
 int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);\r
 void ASN1_STRING_TABLE_cleanup(void);\r
@@ -1085,9 +1097,11 @@ void ASN1_STRING_TABLE_cleanup(void);
 /* Old API compatible functions */\r
 ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);\r
 void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);\r
-ASN1_VALUE * ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it);\r
+ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,\r
+                          long len, const ASN1_ITEM *it);\r
 int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);\r
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);\r
+int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out,\r
+                       const ASN1_ITEM *it);\r
 \r
 void ASN1_add_oid_module(void);\r
 \r
@@ -1097,26 +1111,26 @@ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
 /* ASN1 Print flags */\r
 \r
 /* Indicate missing OPTIONAL fields */\r
-#define ASN1_PCTX_FLAGS_SHOW_ABSENT            0x001\r
+# define ASN1_PCTX_FLAGS_SHOW_ABSENT             0x001\r
 /* Mark start and end of SEQUENCE */\r
-#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE          0x002\r
+# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE           0x002\r
 /* Mark start and end of SEQUENCE/SET OF */\r
-#define ASN1_PCTX_FLAGS_SHOW_SSOF              0x004\r
+# define ASN1_PCTX_FLAGS_SHOW_SSOF               0x004\r
 /* Show the ASN1 type of primitives */\r
-#define ASN1_PCTX_FLAGS_SHOW_TYPE              0x008\r
+# define ASN1_PCTX_FLAGS_SHOW_TYPE               0x008\r
 /* Don't show ASN1 type of ANY */\r
-#define ASN1_PCTX_FLAGS_NO_ANY_TYPE            0x010\r
+# define ASN1_PCTX_FLAGS_NO_ANY_TYPE             0x010\r
 /* Don't show ASN1 type of MSTRINGs */\r
-#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE                0x020\r
+# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE         0x020\r
 /* Don't show field names in SEQUENCE */\r
-#define ASN1_PCTX_FLAGS_NO_FIELD_NAME          0x040\r
+# define ASN1_PCTX_FLAGS_NO_FIELD_NAME           0x040\r
 /* Show structure names of each SEQUENCE field */\r
-#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME 0x080\r
+# define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME  0x080\r
 /* Don't show structure name even at top level */\r
-#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME         0x100\r
+# define ASN1_PCTX_FLAGS_NO_STRUCT_NAME          0x100\r
 \r
 int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,\r
-                               const ASN1_ITEM *it, const ASN1_PCTX *pctx);\r
+                    const ASN1_ITEM *it, const ASN1_PCTX *pctx);\r
 ASN1_PCTX *ASN1_PCTX_new(void);\r
 void ASN1_PCTX_free(ASN1_PCTX *p);\r
 unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);\r
@@ -1135,20 +1149,19 @@ BIO_METHOD *BIO_f_asn1(void);
 BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);\r
 \r
 int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,\r
-                               const ASN1_ITEM *it);\r
+                        const ASN1_ITEM *it);\r
 int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,\r
-                               const char *hdr,\r
-                               const ASN1_ITEM *it);\r
+                              const char *hdr, const ASN1_ITEM *it);\r
 int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,\r
-                               int ctype_nid, int econt_nid,\r
-                               STACK_OF(X509_ALGOR) *mdalgs,\r
-                               const ASN1_ITEM *it);\r
+                     int ctype_nid, int econt_nid,\r
+                     STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);\r
 ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);\r
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);\r
 int SMIME_text(BIO *in, BIO *out);\r
 \r
 /* BEGIN ERROR CODES */\r
-/* The following lines are auto generated by the script mkerr.pl. Any changes\r
+/*\r
+ * The following lines are auto generated by the script mkerr.pl. Any changes\r
  * made after this point may be overwritten when the script is next run.\r
  */\r
 void ERR_load_ASN1_strings(void);\r
@@ -1156,249 +1169,249 @@ void ERR_load_ASN1_strings(void);
 /* Error codes for the ASN1 functions. */\r
 \r
 /* Function codes. */\r
-#define ASN1_F_A2D_ASN1_OBJECT                          100\r
-#define ASN1_F_A2I_ASN1_ENUMERATED                      101\r
-#define ASN1_F_A2I_ASN1_INTEGER                                 102\r
-#define ASN1_F_A2I_ASN1_STRING                          103\r
-#define ASN1_F_APPEND_EXP                               176\r
-#define ASN1_F_ASN1_BIT_STRING_SET_BIT                  183\r
-#define ASN1_F_ASN1_CB                                  177\r
-#define ASN1_F_ASN1_CHECK_TLEN                          104\r
-#define ASN1_F_ASN1_COLLATE_PRIMITIVE                   105\r
-#define ASN1_F_ASN1_COLLECT                             106\r
-#define ASN1_F_ASN1_D2I_EX_PRIMITIVE                    108\r
-#define ASN1_F_ASN1_D2I_FP                              109\r
-#define ASN1_F_ASN1_D2I_READ_BIO                        107\r
-#define ASN1_F_ASN1_DIGEST                              184\r
-#define ASN1_F_ASN1_DO_ADB                              110\r
-#define ASN1_F_ASN1_DUP                                         111\r
-#define ASN1_F_ASN1_ENUMERATED_SET                      112\r
-#define ASN1_F_ASN1_ENUMERATED_TO_BN                    113\r
-#define ASN1_F_ASN1_EX_C2I                              204\r
-#define ASN1_F_ASN1_FIND_END                            190\r
-#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                         216\r
-#define ASN1_F_ASN1_GENERALIZEDTIME_SET                         185\r
-#define ASN1_F_ASN1_GENERATE_V3                                 178\r
-#define ASN1_F_ASN1_GET_OBJECT                          114\r
-#define ASN1_F_ASN1_HEADER_NEW                          115\r
-#define ASN1_F_ASN1_I2D_BIO                             116\r
-#define ASN1_F_ASN1_I2D_FP                              117\r
-#define ASN1_F_ASN1_INTEGER_SET                                 118\r
-#define ASN1_F_ASN1_INTEGER_TO_BN                       119\r
-#define ASN1_F_ASN1_ITEM_D2I_FP                                 206\r
-#define ASN1_F_ASN1_ITEM_DUP                            191\r
-#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW                         121\r
-#define ASN1_F_ASN1_ITEM_EX_D2I                                 120\r
-#define ASN1_F_ASN1_ITEM_I2D_BIO                        192\r
-#define ASN1_F_ASN1_ITEM_I2D_FP                                 193\r
-#define ASN1_F_ASN1_ITEM_PACK                           198\r
-#define ASN1_F_ASN1_ITEM_SIGN                           195\r
-#define ASN1_F_ASN1_ITEM_SIGN_CTX                       220\r
-#define ASN1_F_ASN1_ITEM_UNPACK                                 199\r
-#define ASN1_F_ASN1_ITEM_VERIFY                                 197\r
-#define ASN1_F_ASN1_MBSTRING_NCOPY                      122\r
-#define ASN1_F_ASN1_OBJECT_NEW                          123\r
-#define ASN1_F_ASN1_OUTPUT_DATA                                 214\r
-#define ASN1_F_ASN1_PACK_STRING                                 124\r
-#define ASN1_F_ASN1_PCTX_NEW                            205\r
-#define ASN1_F_ASN1_PKCS5_PBE_SET                       125\r
-#define ASN1_F_ASN1_SEQ_PACK                            126\r
-#define ASN1_F_ASN1_SEQ_UNPACK                          127\r
-#define ASN1_F_ASN1_SIGN                                128\r
-#define ASN1_F_ASN1_STR2TYPE                            179\r
-#define ASN1_F_ASN1_STRING_SET                          186\r
-#define ASN1_F_ASN1_STRING_TABLE_ADD                    129\r
-#define ASN1_F_ASN1_STRING_TYPE_NEW                     130\r
-#define ASN1_F_ASN1_TEMPLATE_EX_D2I                     132\r
-#define ASN1_F_ASN1_TEMPLATE_NEW                        133\r
-#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                  131\r
-#define ASN1_F_ASN1_TIME_ADJ                            217\r
-#define ASN1_F_ASN1_TIME_SET                            175\r
-#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING            134\r
-#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                135\r
-#define ASN1_F_ASN1_UNPACK_STRING                       136\r
-#define ASN1_F_ASN1_UTCTIME_ADJ                                 218\r
-#define ASN1_F_ASN1_UTCTIME_SET                                 187\r
-#define ASN1_F_ASN1_VERIFY                              137\r
-#define ASN1_F_B64_READ_ASN1                            209\r
-#define ASN1_F_B64_WRITE_ASN1                           210\r
-#define ASN1_F_BIO_NEW_NDEF                             208\r
-#define ASN1_F_BITSTR_CB                                180\r
-#define ASN1_F_BN_TO_ASN1_ENUMERATED                    138\r
-#define ASN1_F_BN_TO_ASN1_INTEGER                       139\r
-#define ASN1_F_C2I_ASN1_BIT_STRING                      189\r
-#define ASN1_F_C2I_ASN1_INTEGER                                 194\r
-#define ASN1_F_C2I_ASN1_OBJECT                          196\r
-#define ASN1_F_COLLECT_DATA                             140\r
-#define ASN1_F_D2I_ASN1_BIT_STRING                      141\r
-#define ASN1_F_D2I_ASN1_BOOLEAN                                 142\r
-#define ASN1_F_D2I_ASN1_BYTES                           143\r
-#define ASN1_F_D2I_ASN1_GENERALIZEDTIME                         144\r
-#define ASN1_F_D2I_ASN1_HEADER                          145\r
-#define ASN1_F_D2I_ASN1_INTEGER                                 146\r
-#define ASN1_F_D2I_ASN1_OBJECT                          147\r
-#define ASN1_F_D2I_ASN1_SET                             148\r
-#define ASN1_F_D2I_ASN1_TYPE_BYTES                      149\r
-#define ASN1_F_D2I_ASN1_UINTEGER                        150\r
-#define ASN1_F_D2I_ASN1_UTCTIME                                 151\r
-#define ASN1_F_D2I_AUTOPRIVATEKEY                       207\r
-#define ASN1_F_D2I_NETSCAPE_RSA                                 152\r
-#define ASN1_F_D2I_NETSCAPE_RSA_2                       153\r
-#define ASN1_F_D2I_PRIVATEKEY                           154\r
-#define ASN1_F_D2I_PUBLICKEY                            155\r
-#define ASN1_F_D2I_RSA_NET                              200\r
-#define ASN1_F_D2I_RSA_NET_2                            201\r
-#define ASN1_F_D2I_X509                                         156\r
-#define ASN1_F_D2I_X509_CINF                            157\r
-#define ASN1_F_D2I_X509_PKEY                            159\r
-#define ASN1_F_I2D_ASN1_BIO_STREAM                      211\r
-#define ASN1_F_I2D_ASN1_SET                             188\r
-#define ASN1_F_I2D_ASN1_TIME                            160\r
-#define ASN1_F_I2D_DSA_PUBKEY                           161\r
-#define ASN1_F_I2D_EC_PUBKEY                            181\r
-#define ASN1_F_I2D_PRIVATEKEY                           163\r
-#define ASN1_F_I2D_PUBLICKEY                            164\r
-#define ASN1_F_I2D_RSA_NET                              162\r
-#define ASN1_F_I2D_RSA_PUBKEY                           165\r
-#define ASN1_F_LONG_C2I                                         166\r
-#define ASN1_F_OID_MODULE_INIT                          174\r
-#define ASN1_F_PARSE_TAGGING                            182\r
-#define ASN1_F_PKCS5_PBE2_SET_IV                        167\r
-#define ASN1_F_PKCS5_PBE_SET                            202\r
-#define ASN1_F_PKCS5_PBE_SET0_ALGOR                     215\r
-#define ASN1_F_PKCS5_PBKDF2_SET                                 219\r
-#define ASN1_F_SMIME_READ_ASN1                          212\r
-#define ASN1_F_SMIME_TEXT                               213\r
-#define ASN1_F_X509_CINF_NEW                            168\r
-#define ASN1_F_X509_CRL_ADD0_REVOKED                    169\r
-#define ASN1_F_X509_INFO_NEW                            170\r
-#define ASN1_F_X509_NAME_ENCODE                                 203\r
-#define ASN1_F_X509_NAME_EX_D2I                                 158\r
-#define ASN1_F_X509_NAME_EX_NEW                                 171\r
-#define ASN1_F_X509_NEW                                         172\r
-#define ASN1_F_X509_PKEY_NEW                            173\r
+# define ASN1_F_A2D_ASN1_OBJECT                           100\r
+# define ASN1_F_A2I_ASN1_ENUMERATED                       101\r
+# define ASN1_F_A2I_ASN1_INTEGER                          102\r
+# define ASN1_F_A2I_ASN1_STRING                           103\r
+# define ASN1_F_APPEND_EXP                                176\r
+# define ASN1_F_ASN1_BIT_STRING_SET_BIT                   183\r
+# define ASN1_F_ASN1_CB                                   177\r
+# define ASN1_F_ASN1_CHECK_TLEN                           104\r
+# define ASN1_F_ASN1_COLLATE_PRIMITIVE                    105\r
+# define ASN1_F_ASN1_COLLECT                              106\r
+# define ASN1_F_ASN1_D2I_EX_PRIMITIVE                     108\r
+# define ASN1_F_ASN1_D2I_FP                               109\r
+# define ASN1_F_ASN1_D2I_READ_BIO                         107\r
+# define ASN1_F_ASN1_DIGEST                               184\r
+# define ASN1_F_ASN1_DO_ADB                               110\r
+# define ASN1_F_ASN1_DUP                                  111\r
+# define ASN1_F_ASN1_ENUMERATED_SET                       112\r
+# define ASN1_F_ASN1_ENUMERATED_TO_BN                     113\r
+# define ASN1_F_ASN1_EX_C2I                               204\r
+# define ASN1_F_ASN1_FIND_END                             190\r
+# define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                  216\r
+# define ASN1_F_ASN1_GENERALIZEDTIME_SET                  185\r
+# define ASN1_F_ASN1_GENERATE_V3                          178\r
+# define ASN1_F_ASN1_GET_OBJECT                           114\r
+# define ASN1_F_ASN1_HEADER_NEW                           115\r
+# define ASN1_F_ASN1_I2D_BIO                              116\r
+# define ASN1_F_ASN1_I2D_FP                               117\r
+# define ASN1_F_ASN1_INTEGER_SET                          118\r
+# define ASN1_F_ASN1_INTEGER_TO_BN                        119\r
+# define ASN1_F_ASN1_ITEM_D2I_FP                          206\r
+# define ASN1_F_ASN1_ITEM_DUP                             191\r
+# define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW                  121\r
+# define ASN1_F_ASN1_ITEM_EX_D2I                          120\r
+# define ASN1_F_ASN1_ITEM_I2D_BIO                         192\r
+# define ASN1_F_ASN1_ITEM_I2D_FP                          193\r
+# define ASN1_F_ASN1_ITEM_PACK                            198\r
+# define ASN1_F_ASN1_ITEM_SIGN                            195\r
+# define ASN1_F_ASN1_ITEM_SIGN_CTX                        220\r
+# define ASN1_F_ASN1_ITEM_UNPACK                          199\r
+# define ASN1_F_ASN1_ITEM_VERIFY                          197\r
+# define ASN1_F_ASN1_MBSTRING_NCOPY                       122\r
+# define ASN1_F_ASN1_OBJECT_NEW                           123\r
+# define ASN1_F_ASN1_OUTPUT_DATA                          214\r
+# define ASN1_F_ASN1_PACK_STRING                          124\r
+# define ASN1_F_ASN1_PCTX_NEW                             205\r
+# define ASN1_F_ASN1_PKCS5_PBE_SET                        125\r
+# define ASN1_F_ASN1_SEQ_PACK                             126\r
+# define ASN1_F_ASN1_SEQ_UNPACK                           127\r
+# define ASN1_F_ASN1_SIGN                                 128\r
+# define ASN1_F_ASN1_STR2TYPE                             179\r
+# define ASN1_F_ASN1_STRING_SET                           186\r
+# define ASN1_F_ASN1_STRING_TABLE_ADD                     129\r
+# define ASN1_F_ASN1_STRING_TYPE_NEW                      130\r
+# define ASN1_F_ASN1_TEMPLATE_EX_D2I                      132\r
+# define ASN1_F_ASN1_TEMPLATE_NEW                         133\r
+# define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   131\r
+# define ASN1_F_ASN1_TIME_ADJ                             217\r
+# define ASN1_F_ASN1_TIME_SET                             175\r
+# define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             134\r
+# define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 135\r
+# define ASN1_F_ASN1_UNPACK_STRING                        136\r
+# define ASN1_F_ASN1_UTCTIME_ADJ                          218\r
+# define ASN1_F_ASN1_UTCTIME_SET                          187\r
+# define ASN1_F_ASN1_VERIFY                               137\r
+# define ASN1_F_B64_READ_ASN1                             209\r
+# define ASN1_F_B64_WRITE_ASN1                            210\r
+# define ASN1_F_BIO_NEW_NDEF                              208\r
+# define ASN1_F_BITSTR_CB                                 180\r
+# define ASN1_F_BN_TO_ASN1_ENUMERATED                     138\r
+# define ASN1_F_BN_TO_ASN1_INTEGER                        139\r
+# define ASN1_F_C2I_ASN1_BIT_STRING                       189\r
+# define ASN1_F_C2I_ASN1_INTEGER                          194\r
+# define ASN1_F_C2I_ASN1_OBJECT                           196\r
+# define ASN1_F_COLLECT_DATA                              140\r
+# define ASN1_F_D2I_ASN1_BIT_STRING                       141\r
+# define ASN1_F_D2I_ASN1_BOOLEAN                          142\r
+# define ASN1_F_D2I_ASN1_BYTES                            143\r
+# define ASN1_F_D2I_ASN1_GENERALIZEDTIME                  144\r
+# define ASN1_F_D2I_ASN1_HEADER                           145\r
+# define ASN1_F_D2I_ASN1_INTEGER                          146\r
+# define ASN1_F_D2I_ASN1_OBJECT                           147\r
+# define ASN1_F_D2I_ASN1_SET                              148\r
+# define ASN1_F_D2I_ASN1_TYPE_BYTES                       149\r
+# define ASN1_F_D2I_ASN1_UINTEGER                         150\r
+# define ASN1_F_D2I_ASN1_UTCTIME                          151\r
+# define ASN1_F_D2I_AUTOPRIVATEKEY                        207\r
+# define ASN1_F_D2I_NETSCAPE_RSA                          152\r
+# define ASN1_F_D2I_NETSCAPE_RSA_2                        153\r
+# define ASN1_F_D2I_PRIVATEKEY                            154\r
+# define ASN1_F_D2I_PUBLICKEY                             155\r
+# define ASN1_F_D2I_RSA_NET                               200\r
+# define ASN1_F_D2I_RSA_NET_2                             201\r
+# define ASN1_F_D2I_X509                                  156\r
+# define ASN1_F_D2I_X509_CINF                             157\r
+# define ASN1_F_D2I_X509_PKEY                             159\r
+# define ASN1_F_I2D_ASN1_BIO_STREAM                       211\r
+# define ASN1_F_I2D_ASN1_SET                              188\r
+# define ASN1_F_I2D_ASN1_TIME                             160\r
+# define ASN1_F_I2D_DSA_PUBKEY                            161\r
+# define ASN1_F_I2D_EC_PUBKEY                             181\r
+# define ASN1_F_I2D_PRIVATEKEY                            163\r
+# define ASN1_F_I2D_PUBLICKEY                             164\r
+# define ASN1_F_I2D_RSA_NET                               162\r
+# define ASN1_F_I2D_RSA_PUBKEY                            165\r
+# define ASN1_F_LONG_C2I                                  166\r
+# define ASN1_F_OID_MODULE_INIT                           174\r
+# define ASN1_F_PARSE_TAGGING                             182\r
+# define ASN1_F_PKCS5_PBE2_SET_IV                         167\r
+# define ASN1_F_PKCS5_PBE_SET                             202\r
+# define ASN1_F_PKCS5_PBE_SET0_ALGOR                      215\r
+# define ASN1_F_PKCS5_PBKDF2_SET                          219\r
+# define ASN1_F_SMIME_READ_ASN1                           212\r
+# define ASN1_F_SMIME_TEXT                                213\r
+# define ASN1_F_X509_CINF_NEW                             168\r
+# define ASN1_F_X509_CRL_ADD0_REVOKED                     169\r
+# define ASN1_F_X509_INFO_NEW                             170\r
+# define ASN1_F_X509_NAME_ENCODE                          203\r
+# define ASN1_F_X509_NAME_EX_D2I                          158\r
+# define ASN1_F_X509_NAME_EX_NEW                          171\r
+# define ASN1_F_X509_NEW                                  172\r
+# define ASN1_F_X509_PKEY_NEW                             173\r
 \r
 /* Reason codes. */\r
-#define ASN1_R_ADDING_OBJECT                            171\r
-#define ASN1_R_ASN1_PARSE_ERROR                                 203\r
-#define ASN1_R_ASN1_SIG_PARSE_ERROR                     204\r
-#define ASN1_R_AUX_ERROR                                100\r
-#define ASN1_R_BAD_CLASS                                101\r
-#define ASN1_R_BAD_OBJECT_HEADER                        102\r
-#define ASN1_R_BAD_PASSWORD_READ                        103\r
-#define ASN1_R_BAD_TAG                                  104\r
-#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                214\r
-#define ASN1_R_BN_LIB                                   105\r
-#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                  106\r
-#define ASN1_R_BUFFER_TOO_SMALL                                 107\r
-#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER          108\r
-#define ASN1_R_CONTEXT_NOT_INITIALISED                  217\r
-#define ASN1_R_DATA_IS_WRONG                            109\r
-#define ASN1_R_DECODE_ERROR                             110\r
-#define ASN1_R_DECODING_ERROR                           111\r
-#define ASN1_R_DEPTH_EXCEEDED                           174\r
-#define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED        198\r
-#define ASN1_R_ENCODE_ERROR                             112\r
-#define ASN1_R_ERROR_GETTING_TIME                       173\r
-#define ASN1_R_ERROR_LOADING_SECTION                    172\r
-#define ASN1_R_ERROR_PARSING_SET_ELEMENT                113\r
-#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS              114\r
-#define ASN1_R_EXPECTING_AN_INTEGER                     115\r
-#define ASN1_R_EXPECTING_AN_OBJECT                      116\r
-#define ASN1_R_EXPECTING_A_BOOLEAN                      117\r
-#define ASN1_R_EXPECTING_A_TIME                                 118\r
-#define ASN1_R_EXPLICIT_LENGTH_MISMATCH                         119\r
-#define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED             120\r
-#define ASN1_R_FIELD_MISSING                            121\r
-#define ASN1_R_FIRST_NUM_TOO_LARGE                      122\r
-#define ASN1_R_HEADER_TOO_LONG                          123\r
-#define ASN1_R_ILLEGAL_BITSTRING_FORMAT                         175\r
-#define ASN1_R_ILLEGAL_BOOLEAN                          176\r
-#define ASN1_R_ILLEGAL_CHARACTERS                       124\r
-#define ASN1_R_ILLEGAL_FORMAT                           177\r
-#define ASN1_R_ILLEGAL_HEX                              178\r
-#define ASN1_R_ILLEGAL_IMPLICIT_TAG                     179\r
-#define ASN1_R_ILLEGAL_INTEGER                          180\r
-#define ASN1_R_ILLEGAL_NESTED_TAGGING                   181\r
-#define ASN1_R_ILLEGAL_NULL                             125\r
-#define ASN1_R_ILLEGAL_NULL_VALUE                       182\r
-#define ASN1_R_ILLEGAL_OBJECT                           183\r
-#define ASN1_R_ILLEGAL_OPTIONAL_ANY                     126\r
-#define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE                 170\r
-#define ASN1_R_ILLEGAL_TAGGED_ANY                       127\r
-#define ASN1_R_ILLEGAL_TIME_VALUE                       184\r
-#define ASN1_R_INTEGER_NOT_ASCII_FORMAT                         185\r
-#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG               128\r
-#define ASN1_R_INVALID_BIT_STRING_BITS_LEFT             220\r
-#define ASN1_R_INVALID_BMPSTRING_LENGTH                         129\r
-#define ASN1_R_INVALID_DIGIT                            130\r
-#define ASN1_R_INVALID_MIME_TYPE                        205\r
-#define ASN1_R_INVALID_MODIFIER                                 186\r
-#define ASN1_R_INVALID_NUMBER                           187\r
-#define ASN1_R_INVALID_OBJECT_ENCODING                  216\r
-#define ASN1_R_INVALID_SEPARATOR                        131\r
-#define ASN1_R_INVALID_TIME_FORMAT                      132\r
-#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH           133\r
-#define ASN1_R_INVALID_UTF8STRING                       134\r
-#define ASN1_R_IV_TOO_LARGE                             135\r
-#define ASN1_R_LENGTH_ERROR                             136\r
-#define ASN1_R_LIST_ERROR                               188\r
-#define ASN1_R_MIME_NO_CONTENT_TYPE                     206\r
-#define ASN1_R_MIME_PARSE_ERROR                                 207\r
-#define ASN1_R_MIME_SIG_PARSE_ERROR                     208\r
-#define ASN1_R_MISSING_EOC                              137\r
-#define ASN1_R_MISSING_SECOND_NUMBER                    138\r
-#define ASN1_R_MISSING_VALUE                            189\r
-#define ASN1_R_MSTRING_NOT_UNIVERSAL                    139\r
-#define ASN1_R_MSTRING_WRONG_TAG                        140\r
-#define ASN1_R_NESTED_ASN1_STRING                       197\r
-#define ASN1_R_NON_HEX_CHARACTERS                       141\r
-#define ASN1_R_NOT_ASCII_FORMAT                                 190\r
-#define ASN1_R_NOT_ENOUGH_DATA                          142\r
-#define ASN1_R_NO_CONTENT_TYPE                          209\r
-#define ASN1_R_NO_DEFAULT_DIGEST                        201\r
-#define ASN1_R_NO_MATCHING_CHOICE_TYPE                  143\r
-#define ASN1_R_NO_MULTIPART_BODY_FAILURE                210\r
-#define ASN1_R_NO_MULTIPART_BOUNDARY                    211\r
-#define ASN1_R_NO_SIG_CONTENT_TYPE                      212\r
-#define ASN1_R_NULL_IS_WRONG_LENGTH                     144\r
-#define ASN1_R_OBJECT_NOT_ASCII_FORMAT                  191\r
-#define ASN1_R_ODD_NUMBER_OF_CHARS                      145\r
-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING               146\r
-#define ASN1_R_SECOND_NUMBER_TOO_LARGE                  147\r
-#define ASN1_R_SEQUENCE_LENGTH_MISMATCH                         148\r
-#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                         149\r
-#define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG             192\r
-#define ASN1_R_SHORT_LINE                               150\r
-#define ASN1_R_SIG_INVALID_MIME_TYPE                    213\r
-#define ASN1_R_STREAMING_NOT_SUPPORTED                  202\r
-#define ASN1_R_STRING_TOO_LONG                          151\r
-#define ASN1_R_STRING_TOO_SHORT                                 152\r
-#define ASN1_R_TAG_VALUE_TOO_HIGH                       153\r
-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154\r
-#define ASN1_R_TIME_NOT_ASCII_FORMAT                    193\r
-#define ASN1_R_TOO_LONG                                         155\r
-#define ASN1_R_TYPE_NOT_CONSTRUCTED                     156\r
-#define ASN1_R_TYPE_NOT_PRIMITIVE                       218\r
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                         157\r
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY                 158\r
-#define ASN1_R_UNEXPECTED_EOC                           159\r
-#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH          215\r
-#define ASN1_R_UNKNOWN_FORMAT                           160\r
-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM                 161\r
-#define ASN1_R_UNKNOWN_OBJECT_TYPE                      162\r
-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                  163\r
-#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM              199\r
-#define ASN1_R_UNKNOWN_TAG                              194\r
-#define ASN1_R_UNKOWN_FORMAT                            195\r
-#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE          164\r
-#define ASN1_R_UNSUPPORTED_CIPHER                       165\r
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM                 166\r
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE              167\r
-#define ASN1_R_UNSUPPORTED_TYPE                                 196\r
-#define ASN1_R_WRONG_PUBLIC_KEY_TYPE                    200\r
-#define ASN1_R_WRONG_TAG                                168\r
-#define ASN1_R_WRONG_TYPE                               169\r
+# define ASN1_R_ADDING_OBJECT                             171\r
+# define ASN1_R_ASN1_PARSE_ERROR                          203\r
+# define ASN1_R_ASN1_SIG_PARSE_ERROR                      204\r
+# define ASN1_R_AUX_ERROR                                 100\r
+# define ASN1_R_BAD_CLASS                                 101\r
+# define ASN1_R_BAD_OBJECT_HEADER                         102\r
+# define ASN1_R_BAD_PASSWORD_READ                         103\r
+# define ASN1_R_BAD_TAG                                   104\r
+# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                 214\r
+# define ASN1_R_BN_LIB                                    105\r
+# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106\r
+# define ASN1_R_BUFFER_TOO_SMALL                          107\r
+# define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108\r
+# define ASN1_R_CONTEXT_NOT_INITIALISED                   217\r
+# define ASN1_R_DATA_IS_WRONG                             109\r
+# define ASN1_R_DECODE_ERROR                              110\r
+# define ASN1_R_DECODING_ERROR                            111\r
+# define ASN1_R_DEPTH_EXCEEDED                            174\r
+# define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED         198\r
+# define ASN1_R_ENCODE_ERROR                              112\r
+# define ASN1_R_ERROR_GETTING_TIME                        173\r
+# define ASN1_R_ERROR_LOADING_SECTION                     172\r
+# define ASN1_R_ERROR_PARSING_SET_ELEMENT                 113\r
+# define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               114\r
+# define ASN1_R_EXPECTING_AN_INTEGER                      115\r
+# define ASN1_R_EXPECTING_AN_OBJECT                       116\r
+# define ASN1_R_EXPECTING_A_BOOLEAN                       117\r
+# define ASN1_R_EXPECTING_A_TIME                          118\r
+# define ASN1_R_EXPLICIT_LENGTH_MISMATCH                  119\r
+# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED              120\r
+# define ASN1_R_FIELD_MISSING                             121\r
+# define ASN1_R_FIRST_NUM_TOO_LARGE                       122\r
+# define ASN1_R_HEADER_TOO_LONG                           123\r
+# define ASN1_R_ILLEGAL_BITSTRING_FORMAT                  175\r
+# define ASN1_R_ILLEGAL_BOOLEAN                           176\r
+# define ASN1_R_ILLEGAL_CHARACTERS                        124\r
+# define ASN1_R_ILLEGAL_FORMAT                            177\r
+# define ASN1_R_ILLEGAL_HEX                               178\r
+# define ASN1_R_ILLEGAL_IMPLICIT_TAG                      179\r
+# define ASN1_R_ILLEGAL_INTEGER                           180\r
+# define ASN1_R_ILLEGAL_NESTED_TAGGING                    181\r
+# define ASN1_R_ILLEGAL_NULL                              125\r
+# define ASN1_R_ILLEGAL_NULL_VALUE                        182\r
+# define ASN1_R_ILLEGAL_OBJECT                            183\r
+# define ASN1_R_ILLEGAL_OPTIONAL_ANY                      126\r
+# define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE          170\r
+# define ASN1_R_ILLEGAL_TAGGED_ANY                        127\r
+# define ASN1_R_ILLEGAL_TIME_VALUE                        184\r
+# define ASN1_R_INTEGER_NOT_ASCII_FORMAT                  185\r
+# define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG                128\r
+# define ASN1_R_INVALID_BIT_STRING_BITS_LEFT              220\r
+# define ASN1_R_INVALID_BMPSTRING_LENGTH                  129\r
+# define ASN1_R_INVALID_DIGIT                             130\r
+# define ASN1_R_INVALID_MIME_TYPE                         205\r
+# define ASN1_R_INVALID_MODIFIER                          186\r
+# define ASN1_R_INVALID_NUMBER                            187\r
+# define ASN1_R_INVALID_OBJECT_ENCODING                   216\r
+# define ASN1_R_INVALID_SEPARATOR                         131\r
+# define ASN1_R_INVALID_TIME_FORMAT                       132\r
+# define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH            133\r
+# define ASN1_R_INVALID_UTF8STRING                        134\r
+# define ASN1_R_IV_TOO_LARGE                              135\r
+# define ASN1_R_LENGTH_ERROR                              136\r
+# define ASN1_R_LIST_ERROR                                188\r
+# define ASN1_R_MIME_NO_CONTENT_TYPE                      206\r
+# define ASN1_R_MIME_PARSE_ERROR                          207\r
+# define ASN1_R_MIME_SIG_PARSE_ERROR                      208\r
+# define ASN1_R_MISSING_EOC                               137\r
+# define ASN1_R_MISSING_SECOND_NUMBER                     138\r
+# define ASN1_R_MISSING_VALUE                             189\r
+# define ASN1_R_MSTRING_NOT_UNIVERSAL                     139\r
+# define ASN1_R_MSTRING_WRONG_TAG                         140\r
+# define ASN1_R_NESTED_ASN1_STRING                        197\r
+# define ASN1_R_NON_HEX_CHARACTERS                        141\r
+# define ASN1_R_NOT_ASCII_FORMAT                          190\r
+# define ASN1_R_NOT_ENOUGH_DATA                           142\r
+# define ASN1_R_NO_CONTENT_TYPE                           209\r
+# define ASN1_R_NO_DEFAULT_DIGEST                         201\r
+# define ASN1_R_NO_MATCHING_CHOICE_TYPE                   143\r
+# define ASN1_R_NO_MULTIPART_BODY_FAILURE                 210\r
+# define ASN1_R_NO_MULTIPART_BOUNDARY                     211\r
+# define ASN1_R_NO_SIG_CONTENT_TYPE                       212\r
+# define ASN1_R_NULL_IS_WRONG_LENGTH                      144\r
+# define ASN1_R_OBJECT_NOT_ASCII_FORMAT                   191\r
+# define ASN1_R_ODD_NUMBER_OF_CHARS                       145\r
+# define ASN1_R_PRIVATE_KEY_HEADER_MISSING                146\r
+# define ASN1_R_SECOND_NUMBER_TOO_LARGE                   147\r
+# define ASN1_R_SEQUENCE_LENGTH_MISMATCH                  148\r
+# define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                  149\r
+# define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG              192\r
+# define ASN1_R_SHORT_LINE                                150\r
+# define ASN1_R_SIG_INVALID_MIME_TYPE                     213\r
+# define ASN1_R_STREAMING_NOT_SUPPORTED                   202\r
+# define ASN1_R_STRING_TOO_LONG                           151\r
+# define ASN1_R_STRING_TOO_SHORT                          152\r
+# define ASN1_R_TAG_VALUE_TOO_HIGH                        153\r
+# define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154\r
+# define ASN1_R_TIME_NOT_ASCII_FORMAT                     193\r
+# define ASN1_R_TOO_LONG                                  155\r
+# define ASN1_R_TYPE_NOT_CONSTRUCTED                      156\r
+# define ASN1_R_TYPE_NOT_PRIMITIVE                        218\r
+# define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  157\r
+# define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          158\r
+# define ASN1_R_UNEXPECTED_EOC                            159\r
+# define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH           215\r
+# define ASN1_R_UNKNOWN_FORMAT                            160\r
+# define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          161\r
+# define ASN1_R_UNKNOWN_OBJECT_TYPE                       162\r
+# define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   163\r
+# define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM               199\r
+# define ASN1_R_UNKNOWN_TAG                               194\r
+# define ASN1_R_UNKOWN_FORMAT                             195\r
+# define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE           164\r
+# define ASN1_R_UNSUPPORTED_CIPHER                        165\r
+# define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          166\r
+# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               167\r
+# define ASN1_R_UNSUPPORTED_TYPE                          196\r
+# define ASN1_R_WRONG_PUBLIC_KEY_TYPE                     200\r
+# define ASN1_R_WRONG_TAG                                 168\r
+# define ASN1_R_WRONG_TYPE                                169\r
 \r
 #ifdef  __cplusplus\r
 }\r