OpenSSL 0.9.4 merge

1 files changed, 346 insertions, 260 deletions

diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 9793db365d..5c2d8999bc 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -64,8 +64,9 @@ extern "C" {
 #endif
 
 #include <time.h>
-#include "bn.h"
-#include "stack.h"
+#include <openssl/bn.h>
+#include <openssl/stack.h>
+#include <openssl/safestack.h>
 
 #define V_ASN1_UNIVERSAL                0x00
 #define V_ASN1_APPLICATION              0x40
@@ -73,6 +74,7 @@ extern "C" {
 #define V_ASN1_PRIVATE                  0xc0
 
 #define V_ASN1_CONSTRUCTED              0x20
+#define V_ASN1_PRIMITIVE_TAG            0x1f
 #define V_ASN1_PRIMATIVE_TAG            0x1f
 
 #define V_ASN1_APP_CHOOSE               -2      /* let the recipent choose */
@@ -89,7 +91,9 @@ extern "C" {
 #define V_ASN1_OBJECT_DESCRIPTOR        7
 #define V_ASN1_EXTERNAL                 8
 #define V_ASN1_REAL                     9
-#define V_ASN1_ENUMERATED               10      /* microsoft weirdness */
+#define V_ASN1_ENUMERATED               10
+#define V_ASN1_NEG_ENUMERATED           (10+0x100)
+#define V_ASN1_UTF8STRING               12
 #define V_ASN1_SEQUENCE                 16
 #define V_ASN1_SET                      17
 #define V_ASN1_NUMERICSTRING            18      /**/
@@ -111,111 +115,46 @@ extern "C" {
 #define B_ASN1_NUMERICSTRING    0x0001
 #define B_ASN1_PRINTABLESTRING  0x0002
 #define B_ASN1_T61STRING        0x0004
+#define B_ASN1_TELETEXSTRING    0x0008
 #define B_ASN1_VIDEOTEXSTRING   0x0008
 #define B_ASN1_IA5STRING        0x0010
 #define B_ASN1_GRAPHICSTRING    0x0020
 #define B_ASN1_ISO64STRING      0x0040
+#define B_ASN1_VISIBLESTRING    0x0040
 #define B_ASN1_GENERALSTRING    0x0080
 #define B_ASN1_UNIVERSALSTRING  0x0100
 #define B_ASN1_OCTET_STRING     0x0200
 #define B_ASN1_BIT_STRING       0x0400
 #define B_ASN1_BMPSTRING        0x0800
 #define B_ASN1_UNKNOWN          0x1000
-
-#ifndef DEBUG
-
-#define ASN1_INTEGER            ASN1_STRING
-#define ASN1_BIT_STRING         ASN1_STRING
-#define ASN1_OCTET_STRING       ASN1_STRING
-#define ASN1_PRINTABLESTRING    ASN1_STRING
-#define ASN1_T61STRING          ASN1_STRING
-#define ASN1_IA5STRING          ASN1_STRING
-#define ASN1_UTCTIME            ASN1_STRING
-#define ASN1_GENERALIZEDTIME    ASN1_STRING
-#define ASN1_GENERALSTRING      ASN1_STRING
-#define ASN1_UNIVERSALSTRING    ASN1_STRING
-#define ASN1_BMPSTRING          ASN1_STRING
-
-#else
-
-typedef struct asn1_integer_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_INTEGER;
-
-typedef struct asn1_bit_string_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_BIT_STRING;
-
-typedef struct asn1_octet_string_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_OCTET_STRING;
-
-typedef struct asn1_printablestring_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_PRINTABLESTRING;
-
-typedef struct asn1_t61string_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_T61STRING;
-
-typedef struct asn1_ia5string_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_IA5STRING;
-
-typedef struct asn1_generalstring_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_GENERALSTRING;
-
-typedef struct asn1_universalstring_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_UNIVERSALSTRING;
-
-typedef struct asn1_bmpstring_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_BMPSTRING;
-
-typedef struct asn1_utctime_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_UTCTIME;
-
-typedef struct asn1_generalizedtime_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        } ASN1_GENERALIZEDTIME;
-
-#endif
+#define B_ASN1_UTF8STRING       0x2000
+
+#define DECLARE_ASN1_SET_OF(type) \
+int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
+                           int (*func)(type *,unsigned char **), int ex_tag, \
+                           int ex_class, int is_set); \
+STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
+                                       long length, \
+                                       type *(*func)(type **, \
+                                                     unsigned char **,long), \
+                                       void (*free_func)(type *), \
+                                       int ex_tag,int ex_class);
+
+#define IMPLEMENT_ASN1_SET_OF(type) \
+int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
+                           int (*func)(type *,unsigned char **), int ex_tag, \
+                           int ex_class, int is_set) \
+    { return i2d_ASN1_SET((STACK *)a,pp,func,ex_tag,ex_class,is_set); } \
+STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
+                                       long length, \
+                                       type *(*func)(type **, \
+                                                     unsigned char **,long), \
+                                       void (*free_func)(type *), \
+                                       int ex_tag,int ex_class) \
+    { return (STACK_OF(type) *)d2i_ASN1_SET((STACK **)a,pp,length, \
+                                            (char *(*)())func, \
+                                            (void (*)())free_func, \
+                                            ex_tag,ex_class); }
 
 typedef struct asn1_ctx_st
         {
@@ -229,6 +168,7 @@ typedef struct asn1_ctx_st
         unsigned char *max; /* largest value of p alowed */
         unsigned char *q;/* temporary variable */
         unsigned char **pp;/* variable */
+        int line;       /* used in error processing */
         } ASN1_CTX;
 
 /* These are used internally in the ASN1_OBJECT to keep track of
@@ -239,21 +179,61 @@ typedef struct asn1_ctx_st
 #define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08   /* internal use */
 typedef struct asn1_object_st
         {
-        char *sn,*ln;
+        const char *sn,*ln;
         int nid;
         int length;
         unsigned char *data;
         int flags;      /* Should we free this one */
         } ASN1_OBJECT;
 
+#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
 /* This is the base type that holds just about everything :-) */
 typedef struct asn1_string_st
         {
         int length;
         int type;
         unsigned char *data;
+        /* The value of the following field depends on the type being
+         * held.  It is mostly being used for BIT_STRING so if the
+         * input data has a non-zero 'unused bits' value, it will be
+         * handled correctly */
+        long flags;
         } ASN1_STRING;
 
+#ifndef DEBUG
+#define ASN1_INTEGER            ASN1_STRING
+#define ASN1_ENUMERATED         ASN1_STRING
+#define ASN1_BIT_STRING         ASN1_STRING
+#define ASN1_OCTET_STRING       ASN1_STRING
+#define ASN1_PRINTABLESTRING    ASN1_STRING
+#define ASN1_T61STRING          ASN1_STRING
+#define ASN1_IA5STRING          ASN1_STRING
+#define ASN1_UTCTIME            ASN1_STRING
+#define ASN1_GENERALIZEDTIME    ASN1_STRING
+#define ASN1_TIME               ASN1_STRING
+#define ASN1_GENERALSTRING      ASN1_STRING
+#define ASN1_UNIVERSALSTRING    ASN1_STRING
+#define ASN1_BMPSTRING          ASN1_STRING
+#define ASN1_VISIBLESTRING      ASN1_STRING
+#define ASN1_UTF8STRING         ASN1_STRING
+#else
+typedef struct asn1_string_st ASN1_INTEGER;
+typedef struct asn1_string_st ASN1_ENUMERATED;
+typedef struct asn1_string_st ASN1_BIT_STRING;
+typedef struct asn1_string_st ASN1_OCTET_STRING;
+typedef struct asn1_string_st ASN1_PRINTABLESTRING;
+typedef struct asn1_string_st ASN1_T61STRING;
+typedef struct asn1_string_st ASN1_IA5STRING;
+typedef struct asn1_string_st ASN1_GENERALSTRING;
+typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
+typedef struct asn1_string_st ASN1_BMPSTRING;
+typedef struct asn1_string_st ASN1_UTCTIME;
+typedef struct asn1_string_st ASN1_TIME;
+typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
+typedef struct asn1_string_st ASN1_VISIBLESTRING;
+typedef struct asn1_string_st ASN1_UTF8STRING;
+#endif
+
 typedef struct asn1_type_st
         {
         int type;
@@ -262,6 +242,7 @@ typedef struct asn1_type_st
                 ASN1_STRING *           asn1_string;
                 ASN1_OBJECT *           object;
                 ASN1_INTEGER *          integer;
+                ASN1_ENUMERATED *       enumerated;
                 ASN1_BIT_STRING *       bit_string;
                 ASN1_OCTET_STRING *     octet_string;
                 ASN1_PRINTABLESTRING *  printablestring;
@@ -272,6 +253,8 @@ typedef struct asn1_type_st
                 ASN1_UNIVERSALSTRING *  universalstring;
                 ASN1_UTCTIME *          utctime;
                 ASN1_GENERALIZEDTIME *  generalizedtime;
+                ASN1_VISIBLESTRING *    visiblestring;
+                ASN1_UTF8STRING *       utf8string;
                 /* set and sequence are left complete and still
                  * contain the set or sequence bytes */
                 ASN1_STRING *           set;
@@ -279,6 +262,9 @@ typedef struct asn1_type_st
                 } value;
         } ASN1_TYPE;
 
+DECLARE_STACK_OF(ASN1_TYPE)
+DECLARE_ASN1_SET_OF(ASN1_TYPE)
+
 typedef struct asn1_method_st
         {
         int (*i2d)();
@@ -322,6 +308,17 @@ typedef struct asn1_header_st
 /* i2d_ASN1_INTEGER() is a function */
 /* d2i_ASN1_INTEGER() is a function */
 
+#define ASN1_ENUMERATED_new()   (ASN1_ENUMERATED *)\
+                ASN1_STRING_type_new(V_ASN1_ENUMERATED)
+#define ASN1_ENUMERATED_free(a)         ASN1_STRING_free((ASN1_STRING *)a)
+#define ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)ASN1_STRING_dup((ASN1_STRING *)a)
+#define ASN1_ENUMERATED_cmp(a,b)        ASN1_STRING_cmp(\
+                (ASN1_STRING *)a,(ASN1_STRING *)b)
+/* ASN1_ENUMERATED_set() is a function, also see BN_to_ASN1_ENUMERATED() */
+/* ASN1_ENUMERATED_get() is a function, also see ASN1_ENUMERATED_to_BN() */
+/* i2d_ASN1_ENUMERATED() is a function */
+/* d2i_ASN1_ENUMERATED() is a function */
+
 #define ASN1_OCTET_STRING_new() (ASN1_OCTET_STRING *)\
                 ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
 #define ASN1_OCTET_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
@@ -350,7 +347,29 @@ typedef struct asn1_header_st
                         B_ASN1_BMPSTRING|\
                         B_ASN1_UNKNOWN)
 
-#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING_STRING *)\
+#define DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
+#define DIRECTORYSTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
+                                                pp,a->type,V_ASN1_UNIVERSAL)
+#define M_d2i_DIRECTORYSTRING(a,pp,l) \
+                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
+                        B_ASN1_PRINTABLESTRING| \
+                        B_ASN1_TELETEXSTRING|\
+                        B_ASN1_BMPSTRING|\
+                        B_ASN1_UNIVERSALSTRING|\
+                        B_ASN1_UTF8STRING)
+
+#define DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
+#define DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
+                                                pp,a->type,V_ASN1_UNIVERSAL)
+#define M_d2i_DISPLAYTEXT(a,pp,l) \
+                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
+                        B_ASN1_VISIBLESTRING| \
+                        B_ASN1_BMPSTRING|\
+                        B_ASN1_UTF8STRING)
+
+#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
                 ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
 #define ASN1_PRINTABLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
 #define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
@@ -373,6 +392,8 @@ typedef struct asn1_header_st
 #define ASN1_IA5STRING_new()    (ASN1_IA5STRING *)\
                 ASN1_STRING_type_new(V_ASN1_IA5STRING)
 #define ASN1_IA5STRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
+#define ASN1_IA5STRING_dup(a)   \
+                        (ASN1_IA5STRING *)ASN1_STRING_dup((ASN1_STRING *)a)
 #define M_i2d_ASN1_IA5STRING(a,pp) \
                 i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
                         V_ASN1_UNIVERSAL)
@@ -392,12 +413,22 @@ typedef struct asn1_header_st
 #define ASN1_GENERALIZEDTIME_new()      (ASN1_GENERALIZEDTIME *)\
                 ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
 #define ASN1_GENERALIZEDTIME_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_GENERALIZEDTIME_dup(a) (ASN1_UTCTIME *)ASN1_STRING_dup(\
+#define ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
         (ASN1_STRING *)a)
-/* DOES NOT EXIST YET i2d_ASN1_GENERALIZEDTIME() is a function */
-/* DOES NOT EXIST YET d2i_ASN1_GENERALIZEDTIME() is a function */
-/* DOES NOT EXIST YET ASN1_GENERALIZEDTIME_set() is a function */
-/* DOES NOT EXIST YET ASN1_GENERALIZEDTIME_check() is a function */
+/* i2d_ASN1_GENERALIZEDTIME() is a function */
+/* d2i_ASN1_GENERALIZEDTIME() is a function */
+/* ASN1_GENERALIZEDTIME_set() is a function */
+/* ASN1_GENERALIZEDTIME_check() is a function */
+
+#define ASN1_TIME_new() (ASN1_TIME *)\
+                ASN1_STRING_type_new(V_ASN1_UTCTIME)
+#define ASN1_TIME_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
+#define ASN1_TIME_dup(a) (ASN1_TIME *)ASN1_STRING_dup((ASN1_STRING *)a)
+
+/* i2d_ASN1_TIME() is a function */
+/* d2i_ASN1_TIME() is a function */
+/* ASN1_TIME_set() is a function */
+/* ASN1_TIME_check() is a function */
 
 #define ASN1_GENERALSTRING_new()        (ASN1_GENERALSTRING *)\
                 ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
@@ -429,13 +460,36 @@ typedef struct asn1_header_st
                 (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
                 ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
 
-#ifndef NOPROTO
+#define ASN1_VISIBLESTRING_new()        (ASN1_VISIBLESTRING *)\
+                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
+#define ASN1_VISIBLESTRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_VISIBLESTRING(a,pp) \
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
+                        V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
+                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
+                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
+
+#define ASN1_UTF8STRING_new()   (ASN1_UTF8STRING *)\
+                ASN1_STRING_type_new(V_ASN1_UTF8STRING)
+#define ASN1_UTF8STRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_UTF8STRING(a,pp) \
+                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
+                        V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_UTF8STRING(a,pp,l) \
+                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
+                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
+
+  /* for the is_set parameter to i2d_ASN1_SET */
+#define IS_SEQUENCE     0
+#define IS_SET          1
+
 ASN1_TYPE *     ASN1_TYPE_new(void );
 void            ASN1_TYPE_free(ASN1_TYPE *a);
 int             i2d_ASN1_TYPE(ASN1_TYPE *a,unsigned char **pp);
 ASN1_TYPE *     d2i_ASN1_TYPE(ASN1_TYPE **a,unsigned char **pp,long length);
 int ASN1_TYPE_get(ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, char *value);
+void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
 
 ASN1_OBJECT *   ASN1_OBJECT_new(void );
 void            ASN1_OBJECT_free(ASN1_OBJECT *a);
@@ -443,12 +497,17 @@ int		i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);
 ASN1_OBJECT *   d2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp,
                         long length);
 
+DECLARE_STACK_OF(ASN1_OBJECT)
+DECLARE_ASN1_SET_OF(ASN1_OBJECT)
+
 ASN1_STRING *   ASN1_STRING_new(void );
 void            ASN1_STRING_free(ASN1_STRING *a);
 ASN1_STRING *   ASN1_STRING_dup(ASN1_STRING *a);
 ASN1_STRING *   ASN1_STRING_type_new(int type );
 int             ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b);
-int             ASN1_STRING_set(ASN1_STRING *str,unsigned char *data, int len);
+  /* Since this is used to store all sorts of things, via macros, for now, make
+     its data void * */
+int             ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
 
 int             i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);
 ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,unsigned char **pp,
@@ -463,21 +522,50 @@ int 		d2i_ASN1_BOOLEAN(int *a,unsigned char **pp,long length);
 int             i2d_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
 ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a,unsigned char **pp,
                         long length);
+ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,unsigned char **pp,
+                        long length);
+
+int             i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a,unsigned char **pp);
+ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a,unsigned char **pp,
+                        long length);
 
 int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
 ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, char *str); 
 
+int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
+ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);
+int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, char *str); 
+
 int             i2d_ASN1_OCTET_STRING(ASN1_OCTET_STRING *a,unsigned char **pp);
 ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING(ASN1_OCTET_STRING **a,
                         unsigned char **pp,long length);
 
+int     i2d_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING *a,unsigned char **pp);
+ASN1_VISIBLESTRING *d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a,
+                        unsigned char **pp,long length);
+
+int             i2d_ASN1_UTF8STRING(ASN1_UTF8STRING *a,unsigned char **pp);
+ASN1_UTF8STRING *d2i_ASN1_UTF8STRING(ASN1_UTF8STRING **a,
+                        unsigned char **pp,long length);
+
+int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp);
+ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(ASN1_BMPSTRING **a, unsigned char **pp,
+        long length);
+
 int i2d_ASN1_PRINTABLE(ASN1_STRING *a,unsigned char **pp);
 ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a,
         unsigned char **pp, long l);
 ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a,
         unsigned char **pp, long l);
 
+int     i2d_DIRECTORYSTRING(ASN1_STRING *a,unsigned char **pp);
+ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, unsigned char **pp,
+                                                                 long length);
+
+int     i2d_DISPLAYTEXT(ASN1_STRING *a,unsigned char **pp);
+ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, unsigned char **pp, long length);
+
 ASN1_T61STRING *d2i_ASN1_T61STRING(ASN1_T61STRING **a,
         unsigned char **pp, long l);
 int i2d_ASN1_IA5STRING(ASN1_IA5STRING *a,unsigned char **pp);
@@ -488,21 +576,32 @@ int		i2d_ASN1_UTCTIME(ASN1_UTCTIME *a,unsigned char **pp);
 ASN1_UTCTIME *  d2i_ASN1_UTCTIME(ASN1_UTCTIME **a,unsigned char **pp,
                         long length);
 
+int             i2d_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME *a,unsigned char **pp);
+ASN1_GENERALIZEDTIME *  d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a,unsigned char **pp,
+                        long length);
+
+int             i2d_ASN1_TIME(ASN1_TIME *a,unsigned char **pp);
+ASN1_TIME *     d2i_ASN1_TIME(ASN1_TIME **a,unsigned char **pp, long length);
+ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);
+
 int             i2d_ASN1_SET(STACK *a, unsigned char **pp,
-                        int (*func)(), int ex_tag, int ex_class);
+                        int (*func)(), int ex_tag, int ex_class, int is_set);
 STACK *         d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
-                        char *(*func)(), int ex_tag, int ex_class);
+                        char *(*func)(), void (*free_func)(),
+                        int ex_tag, int ex_class);
 
 #ifdef HEADER_BIO_H
 int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
 int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
+int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
+int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int size);
 int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a);
 int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size);
 int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
 #endif
 int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a);
 
-int a2d_ASN1_OBJECT(unsigned char *out,int olen, char *buf, int num);
+int a2d_ASN1_OBJECT(unsigned char *out,int olen, const char *buf, int num);
 ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,
         char *sn, char *ln);
 
@@ -511,6 +610,11 @@ long ASN1_INTEGER_get(ASN1_INTEGER *a);
 ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai);
 BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai,BIGNUM *bn);
 
+int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
+long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
+ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
+BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);
+
 /* General */
 /* given a string, return the correct type, max is the maximum length */
 int ASN1_PRINTABLE_type(unsigned char *s, int max);
@@ -545,6 +649,8 @@ int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x);
 char *ASN1_d2i_bio(char *(*xnew)(),char *(*d2i)(),BIO *bp,unsigned char **x);
 int ASN1_i2d_bio(int (*i2d)(),BIO *out,unsigned char *x);
 int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
+int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
+int ASN1_TIME_print(BIO *fp,ASN1_TIME *a);
 int ASN1_STRING_print(BIO *bp,ASN1_STRING *v);
 int ASN1_parse(BIO *bp,unsigned char *pp,long len,int indent);
 #endif
@@ -574,111 +680,32 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
 int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
         unsigned char *data, int max_len);
 
-#else
-
-ASN1_TYPE *     ASN1_TYPE_new();
-void            ASN1_TYPE_free();
-int             i2d_ASN1_TYPE();
-ASN1_TYPE *     d2i_ASN1_TYPE();
-int ASN1_TYPE_get();
-void ASN1_TYPE_set();
-
-ASN1_OBJECT *   ASN1_OBJECT_new();
-void            ASN1_OBJECT_free();
-int             i2d_ASN1_OBJECT();
-ASN1_OBJECT *   d2i_ASN1_OBJECT();
-ASN1_STRING *   ASN1_STRING_new();
-void            ASN1_STRING_free();
-ASN1_STRING *   ASN1_STRING_dup();
-ASN1_STRING *   ASN1_STRING_type_new();
-int             ASN1_STRING_cmp();
-int             ASN1_STRING_set();
-int             i2d_ASN1_BIT_STRING();
-ASN1_BIT_STRING *d2i_ASN1_BIT_STRING();
-int             ASN1_BIT_STRING_set_bit();
-int             ASN1_BIT_STRING_get_bit();
-int             i2d_ASN1_BOOLEAN();
-int             d2i_ASN1_BOOLEAN();
-int             i2d_ASN1_INTEGER();
-ASN1_INTEGER *d2i_ASN1_INTEGER();
-int ASN1_UTCTIME_check();
-ASN1_UTCTIME *ASN1_UTCTIME_set();
-int ASN1_UTCTIME_set_string();
-int             i2d_ASN1_OCTET_STRING();
-ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING();
-int i2d_ASN1_PRINTABLE();
-ASN1_STRING *d2i_ASN1_PRINTABLE();
-ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING();
-ASN1_T61STRING *d2i_ASN1_T61STRING();
-int i2d_ASN1_IA5STRING();
-ASN1_IA5STRING *d2i_ASN1_IA5STRING();
-int             i2d_ASN1_UTCTIME();
-ASN1_UTCTIME *  d2i_ASN1_UTCTIME();
-int             i2d_ASN1_SET();
-STACK *         d2i_ASN1_SET();
-int a2d_ASN1_OBJECT();
-ASN1_OBJECT *ASN1_OBJECT_create();
-int ASN1_INTEGER_set();
-long ASN1_INTEGER_get();
-ASN1_INTEGER *BN_to_ASN1_INTEGER();
-BIGNUM *ASN1_INTEGER_to_BN();
-int ASN1_PRINTABLE_type();
-int i2d_ASN1_bytes();
-ASN1_STRING *d2i_ASN1_bytes();
-ASN1_STRING *d2i_ASN1_type_bytes();
-int asn1_Finish();
-int ASN1_get_object();
-int ASN1_check_infinite_end();
-void ASN1_put_object();
-int ASN1_object_size();
-char *ASN1_dup();
-#ifndef NO_FP_API
-char *ASN1_d2i_fp();
-int ASN1_i2d_fp();
-#endif
-
-char *ASN1_d2i_bio();
-int ASN1_i2d_bio();
-int ASN1_UTCTIME_print();
-int ASN1_STRING_print();
-int ASN1_parse();
-int i2a_ASN1_INTEGER();
-int a2i_ASN1_INTEGER();
-int i2a_ASN1_OBJECT();
-int i2t_ASN1_OBJECT();
-int a2i_ASN1_STRING();
-int i2a_ASN1_STRING();
-
-int i2d_ASN1_HEADER();
-ASN1_HEADER *d2i_ASN1_HEADER();
-ASN1_HEADER *ASN1_HEADER_new();
-void ASN1_HEADER_free();
-void ERR_load_ASN1_strings();
-ASN1_METHOD *X509_asn1_meth();
-ASN1_METHOD *RSAPrivateKey_asn1_meth();
-ASN1_METHOD *ASN1_IA5STRING_asn1_meth();
-ASN1_METHOD *ASN1_BIT_STRING_asn1_meth();
-
-int ASN1_UNIVERSALSTRING_to_string();
-
-int ASN1_TYPE_set_octetstring();
-int ASN1_TYPE_get_octetstring();
-int ASN1_TYPE_set_int_octetstring();
-int ASN1_TYPE_get_int_octetstring();
-
-#endif
+STACK *ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)(),
+                                                 void (*free_func)() ); 
+unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf,
+                                                                 int *len );
+void *ASN1_unpack_string(ASN1_STRING *oct, char *(*d2i)());
+ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(), ASN1_OCTET_STRING **oct);
 
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
 /* Error codes for the ASN1 functions. */
 
 /* Function codes. */
 #define ASN1_F_A2D_ASN1_OBJECT                           100
+#define ASN1_F_A2I_ASN1_ENUMERATED                       236
 #define ASN1_F_A2I_ASN1_INTEGER                          101
 #define ASN1_F_A2I_ASN1_STRING                           102
-#define ASN1_F_ASN1_COLLATE_PRIMATIVE                    103
+#define ASN1_F_ASN1_COLLATE_PRIMITIVE                    103
 #define ASN1_F_ASN1_D2I_BIO                              104
 #define ASN1_F_ASN1_D2I_FP                               105
 #define ASN1_F_ASN1_DUP                                  106
+#define ASN1_F_ASN1_ENUMERATED_SET                       232
+#define ASN1_F_ASN1_ENUMERATED_TO_BN                     233
+#define ASN1_F_ASN1_GENERALIZEDTIME_NEW                  222
 #define ASN1_F_ASN1_GET_OBJECT                           107
 #define ASN1_F_ASN1_HEADER_NEW                           108
 #define ASN1_F_ASN1_I2D_BIO                              109
@@ -686,37 +713,65 @@ int ASN1_TYPE_get_int_octetstring();
 #define ASN1_F_ASN1_INTEGER_SET                          111
 #define ASN1_F_ASN1_INTEGER_TO_BN                        112
 #define ASN1_F_ASN1_OBJECT_NEW                           113
+#define ASN1_F_ASN1_PACK_STRING                          245
+#define ASN1_F_ASN1_PBE_SET                              253
+#define ASN1_F_ASN1_SEQ_PACK                             246
+#define ASN1_F_ASN1_SEQ_UNPACK                           247
 #define ASN1_F_ASN1_SIGN                                 114
 #define ASN1_F_ASN1_STRING_NEW                           115
 #define ASN1_F_ASN1_STRING_TYPE_NEW                      116
 #define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             117
 #define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 118
 #define ASN1_F_ASN1_TYPE_NEW                             119
+#define ASN1_F_ASN1_UNPACK_STRING                        248
 #define ASN1_F_ASN1_UTCTIME_NEW                          120
 #define ASN1_F_ASN1_VERIFY                               121
+#define ASN1_F_AUTHORITY_KEYID_NEW                       237
+#define ASN1_F_BASIC_CONSTRAINTS_NEW                     226
+#define ASN1_F_BN_TO_ASN1_ENUMERATED                     234
 #define ASN1_F_BN_TO_ASN1_INTEGER                        122
 #define ASN1_F_D2I_ASN1_BIT_STRING                       123
 #define ASN1_F_D2I_ASN1_BMPSTRING                        124
 #define ASN1_F_D2I_ASN1_BOOLEAN                          125
 #define ASN1_F_D2I_ASN1_BYTES                            126
+#define ASN1_F_D2I_ASN1_ENUMERATED                       235
+#define ASN1_F_D2I_ASN1_GENERALIZEDTIME                  223
 #define ASN1_F_D2I_ASN1_HEADER                           127
 #define ASN1_F_D2I_ASN1_INTEGER                          128
 #define ASN1_F_D2I_ASN1_OBJECT                           129
 #define ASN1_F_D2I_ASN1_OCTET_STRING                     130
 #define ASN1_F_D2I_ASN1_PRINT_TYPE                       131
 #define ASN1_F_D2I_ASN1_SET                              132
+#define ASN1_F_D2I_ASN1_TIME                             224
 #define ASN1_F_D2I_ASN1_TYPE                             133
 #define ASN1_F_D2I_ASN1_TYPE_BYTES                       134
+#define ASN1_F_D2I_ASN1_UINTEGER                         280
 #define ASN1_F_D2I_ASN1_UTCTIME                          135
+#define ASN1_F_D2I_ASN1_UTF8STRING                       266
+#define ASN1_F_D2I_ASN1_VISIBLESTRING                    267
+#define ASN1_F_D2I_AUTHORITY_KEYID                       238
+#define ASN1_F_D2I_BASIC_CONSTRAINTS                     227
 #define ASN1_F_D2I_DHPARAMS                              136
+#define ASN1_F_D2I_DIST_POINT                            276
+#define ASN1_F_D2I_DIST_POINT_NAME                       277
 #define ASN1_F_D2I_DSAPARAMS                             137
 #define ASN1_F_D2I_DSAPRIVATEKEY                         138
 #define ASN1_F_D2I_DSAPUBLICKEY                          139
+#define ASN1_F_D2I_GENERAL_NAME                          230
+#define ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE                228
 #define ASN1_F_D2I_NETSCAPE_PKEY                         140
 #define ASN1_F_D2I_NETSCAPE_RSA                          141
 #define ASN1_F_D2I_NETSCAPE_RSA_2                        142
 #define ASN1_F_D2I_NETSCAPE_SPKAC                        143
 #define ASN1_F_D2I_NETSCAPE_SPKI                         144
+#define ASN1_F_D2I_NOTICEREF                             268
+#define ASN1_F_D2I_PBE2PARAM                             262
+#define ASN1_F_D2I_PBEPARAM                              249
+#define ASN1_F_D2I_PBKDF2PARAM                           263
+#define ASN1_F_D2I_PKCS12                                254
+#define ASN1_F_D2I_PKCS12_BAGS                           255
+#define ASN1_F_D2I_PKCS12_MAC_DATA                       256
+#define ASN1_F_D2I_PKCS12_SAFEBAG                        257
 #define ASN1_F_D2I_PKCS7                                 145
 #define ASN1_F_D2I_PKCS7_DIGEST                          146
 #define ASN1_F_D2I_PKCS7_ENCRYPT                         147
@@ -727,10 +782,17 @@ int ASN1_TYPE_get_int_octetstring();
 #define ASN1_F_D2I_PKCS7_SIGNED                          152
 #define ASN1_F_D2I_PKCS7_SIGNER_INFO                     153
 #define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE                   154
+#define ASN1_F_D2I_PKCS8_PRIV_KEY_INFO                   250
+#define ASN1_F_D2I_PKEY_USAGE_PERIOD                     239
+#define ASN1_F_D2I_POLICYINFO                            269
+#define ASN1_F_D2I_POLICYQUALINFO                        270
 #define ASN1_F_D2I_PRIVATEKEY                            155
 #define ASN1_F_D2I_PUBLICKEY                             156
 #define ASN1_F_D2I_RSAPRIVATEKEY                         157
 #define ASN1_F_D2I_RSAPUBLICKEY                          158
+#define ASN1_F_D2I_SXNET                                 241
+#define ASN1_F_D2I_SXNETID                               243
+#define ASN1_F_D2I_USERNOTICE                            271
 #define ASN1_F_D2I_X509                                  159
 #define ASN1_F_D2I_X509_ALGOR                            160
 #define ASN1_F_D2I_X509_ATTRIBUTE                        161
@@ -748,7 +810,11 @@ int ASN1_TYPE_get_int_octetstring();
 #define ASN1_F_D2I_X509_REVOKED                          173
 #define ASN1_F_D2I_X509_SIG                              174
 #define ASN1_F_D2I_X509_VAL                              175
+#define ASN1_F_DIST_POINT_NAME_NEW                       278
+#define ASN1_F_DIST_POINT_NEW                            279
+#define ASN1_F_GENERAL_NAME_NEW                          231
 #define ASN1_F_I2D_ASN1_HEADER                           176
+#define ASN1_F_I2D_ASN1_TIME                             225
 #define ASN1_F_I2D_DHPARAMS                              177
 #define ASN1_F_I2D_DSAPARAMS                             178
 #define ASN1_F_I2D_DSAPRIVATEKEY                         179
@@ -761,9 +827,19 @@ int ASN1_TYPE_get_int_octetstring();
 #define ASN1_F_I2D_RSAPUBLICKEY                          186
 #define ASN1_F_I2D_X509_ATTRIBUTE                        187
 #define ASN1_F_I2T_ASN1_OBJECT                           188
+#define ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW                229
 #define ASN1_F_NETSCAPE_PKEY_NEW                         189
 #define ASN1_F_NETSCAPE_SPKAC_NEW                        190
 #define ASN1_F_NETSCAPE_SPKI_NEW                         191
+#define ASN1_F_NOTICEREF_NEW                             272
+#define ASN1_F_PBE2PARAM_NEW                             264
+#define ASN1_F_PBEPARAM_NEW                              251
+#define ASN1_F_PBKDF2PARAM_NEW                           265
+#define ASN1_F_PKCS12_BAGS_NEW                           258
+#define ASN1_F_PKCS12_MAC_DATA_NEW                       259
+#define ASN1_F_PKCS12_NEW                                260
+#define ASN1_F_PKCS12_SAFEBAG_NEW                        261
+#define ASN1_F_PKCS5_PBE2_SET                            281
 #define ASN1_F_PKCS7_DIGEST_NEW                          192
 #define ASN1_F_PKCS7_ENCRYPT_NEW                         193
 #define ASN1_F_PKCS7_ENC_CONTENT_NEW                     194
@@ -774,6 +850,13 @@ int ASN1_TYPE_get_int_octetstring();
 #define ASN1_F_PKCS7_SIGNED_NEW                          199
 #define ASN1_F_PKCS7_SIGNER_INFO_NEW                     200
 #define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW                   201
+#define ASN1_F_PKCS8_PRIV_KEY_INFO_NEW                   252
+#define ASN1_F_PKEY_USAGE_PERIOD_NEW                     240
+#define ASN1_F_POLICYINFO_NEW                            273
+#define ASN1_F_POLICYQUALINFO_NEW                        274
+#define ASN1_F_SXNETID_NEW                               244
+#define ASN1_F_SXNET_NEW                                 242
+#define ASN1_F_USERNOTICE_NEW                            275
 #define ASN1_F_X509_ALGOR_NEW                            202
 #define ASN1_F_X509_ATTRIBUTE_NEW                        203
 #define ASN1_F_X509_CINF_NEW                             204
@@ -797,61 +880,64 @@ int ASN1_TYPE_get_int_octetstring();
 
 /* Reason codes. */
 #define ASN1_R_BAD_CLASS                                 100
-#define ASN1_R_BAD_GET_OBJECT                            101
-#define ASN1_R_BAD_OBJECT_HEADER                         102
-#define ASN1_R_BAD_PASSWORD_READ                         103
-#define ASN1_R_BAD_PKCS7_CONTENT                         104
-#define ASN1_R_BAD_PKCS7_TYPE                            105
-#define ASN1_R_BAD_TAG                                   106
-#define ASN1_R_BAD_TYPE                                  107
-#define ASN1_R_BN_LIB                                    108
-#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   109
-#define ASN1_R_BUFFER_TOO_SMALL                          110
-#define ASN1_R_DATA_IS_WRONG                             111
-#define ASN1_R_DECODING_ERROR                            112
-#define ASN1_R_ERROR_STACK                               113
-#define ASN1_R_EXPECTING_AN_INTEGER                      114
-#define ASN1_R_EXPECTING_AN_OBJECT                       115
-#define ASN1_R_EXPECTING_AN_OCTET_STRING                 116
-#define ASN1_R_EXPECTING_A_BIT_STRING                    117
-#define ASN1_R_EXPECTING_A_BOOLEAN                       118
-#define ASN1_R_EXPECTING_A_SEQUENCE                      119
-#define ASN1_R_EXPECTING_A_UTCTIME                       120
-#define ASN1_R_FIRST_NUM_TOO_LARGE                       121
-#define ASN1_R_HEADER_TOO_LONG                           122
-#define ASN1_R_INVALID_DIGIT                             123
-#define ASN1_R_INVALID_SEPARATOR                         124
-#define ASN1_R_INVALID_TIME_FORMAT                       125
-#define ASN1_R_IV_TOO_LARGE                              126
-#define ASN1_R_LENGTH_ERROR                              127
-#define ASN1_R_LENGTH_MISMATCH                           128
-#define ASN1_R_MISSING_EOS                               129
-#define ASN1_R_MISSING_SECOND_NUMBER                     130
-#define ASN1_R_NON_HEX_CHARACTERS                        131
-#define ASN1_R_NOT_ENOUGH_DATA                           132
-#define ASN1_R_ODD_NUMBER_OF_CHARS                       133
-#define ASN1_R_PARSING                                   134
-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING                135
-#define ASN1_R_SECOND_NUMBER_TOO_LARGE                   136
-#define ASN1_R_SHORT_LINE                                137
-#define ASN1_R_STRING_TOO_SHORT                          138
-#define ASN1_R_TAG_VALUE_TOO_HIGH                        139
-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 140
-#define ASN1_R_TOO_LONG                                  141
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  142
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          143
-#define ASN1_R_UNKNOWN_ATTRIBUTE_TYPE                    144
-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          145
-#define ASN1_R_UNKNOWN_OBJECT_TYPE                       146
-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   147
-#define ASN1_R_UNSUPPORTED_CIPHER                        148
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          149
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               150
-#define ASN1_R_UTCTIME_TOO_LONG                          151
-#define ASN1_R_WRONG_PRINTABLE_TYPE                      152
-#define ASN1_R_WRONG_TAG                                 153
-#define ASN1_R_WRONG_TYPE                                154
- 
+#define ASN1_R_BAD_OBJECT_HEADER                         101
+#define ASN1_R_BAD_PASSWORD_READ                         102
+#define ASN1_R_BAD_PKCS7_CONTENT                         103
+#define ASN1_R_BAD_PKCS7_TYPE                            104
+#define ASN1_R_BAD_TAG                                   105
+#define ASN1_R_BAD_TYPE                                  106
+#define ASN1_R_BN_LIB                                    107
+#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   108
+#define ASN1_R_BUFFER_TOO_SMALL                          109
+#define ASN1_R_DATA_IS_WRONG                             110
+#define ASN1_R_DECODE_ERROR                              155
+#define ASN1_R_DECODING_ERROR                            111
+#define ASN1_R_ENCODE_ERROR                              156
+#define ASN1_R_ERROR_PARSING_SET_ELEMENT                 112
+#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               157
+#define ASN1_R_EXPECTING_AN_ENUMERATED                   154
+#define ASN1_R_EXPECTING_AN_INTEGER                      113
+#define ASN1_R_EXPECTING_AN_OBJECT                       114
+#define ASN1_R_EXPECTING_AN_OCTET_STRING                 115
+#define ASN1_R_EXPECTING_A_BIT_STRING                    116
+#define ASN1_R_EXPECTING_A_BOOLEAN                       117
+#define ASN1_R_EXPECTING_A_GENERALIZEDTIME               151
+#define ASN1_R_EXPECTING_A_TIME                          152
+#define ASN1_R_EXPECTING_A_UTCTIME                       118
+#define ASN1_R_FIRST_NUM_TOO_LARGE                       119
+#define ASN1_R_GENERALIZEDTIME_TOO_LONG                  153
+#define ASN1_R_HEADER_TOO_LONG                           120
+#define ASN1_R_INVALID_DIGIT                             121
+#define ASN1_R_INVALID_SEPARATOR                         122
+#define ASN1_R_INVALID_TIME_FORMAT                       123
+#define ASN1_R_IV_TOO_LARGE                              124
+#define ASN1_R_LENGTH_ERROR                              125
+#define ASN1_R_MISSING_SECOND_NUMBER                     126
+#define ASN1_R_NON_HEX_CHARACTERS                        127
+#define ASN1_R_NOT_ENOUGH_DATA                           128
+#define ASN1_R_ODD_NUMBER_OF_CHARS                       129
+#define ASN1_R_PARSING                                   130
+#define ASN1_R_PRIVATE_KEY_HEADER_MISSING                131
+#define ASN1_R_SECOND_NUMBER_TOO_LARGE                   132
+#define ASN1_R_SHORT_LINE                                133
+#define ASN1_R_STRING_TOO_SHORT                          134
+#define ASN1_R_TAG_VALUE_TOO_HIGH                        135
+#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 136
+#define ASN1_R_TOO_LONG                                  137
+#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  138
+#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          139
+#define ASN1_R_UNKNOWN_ATTRIBUTE_TYPE                    140
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          141
+#define ASN1_R_UNKNOWN_OBJECT_TYPE                       142
+#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   143
+#define ASN1_R_UNSUPPORTED_CIPHER                        144
+#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          145
+#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               146
+#define ASN1_R_UTCTIME_TOO_LONG                          147
+#define ASN1_R_WRONG_PRINTABLE_TYPE                      148
+#define ASN1_R_WRONG_TAG                                 149
+#define ASN1_R_WRONG_TYPE                                150
+
 #ifdef  __cplusplus
 }
 #endif