X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fasn1%2Fasn1.h;h=5054ffd30c9d68b06846df5b4e861f6fbc86a72d;hp=cdc342946d5315ca1618683a42717743fa51ae1c;hb=e4119b931172a6a28e2ecb65ef41c6f23b89d09c;hpb=b7896b3cb86d80206af14a14d69b0717786f2729 diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index cdc342946d..5054ffd30c 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -1,5 +1,5 @@ /* crypto/asn1/asn1.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -86,8 +86,11 @@ extern "C" { #define V_ASN1_OCTET_STRING 4 #define V_ASN1_NULL 5 #define V_ASN1_OBJECT 6 +#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_SEQUENCE 16 #define V_ASN1_SET 17 #define V_ASN1_NUMERICSTRING 18 /**/ @@ -103,6 +106,7 @@ extern "C" { #define V_ASN1_VISIBLESTRING 26 /* alias */ #define V_ASN1_GENERALSTRING 27 /**/ #define V_ASN1_UNIVERSALSTRING 28 /**/ +#define V_ASN1_BMPSTRING 30 /* For use with d2i_ASN1_type_bytes() */ #define B_ASN1_NUMERICSTRING 0x0001 @@ -115,87 +119,10 @@ extern "C" { #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_GENERALSTRING ASN1_STRING -#define ASN1_UNIVERSALSTRING 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_utctime_st - { - int length; - int type; - unsigned char *data; - } ASN1_UTCTIME; - -#endif - typedef struct asn1_ctx_st { unsigned char *p;/* work char pointer */ @@ -208,6 +135,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 @@ -225,14 +153,50 @@ typedef struct asn1_object_st 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 +#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; +#endif + typedef struct asn1_type_st { int type; @@ -241,14 +205,17 @@ 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; ASN1_T61STRING * t61string; ASN1_IA5STRING * ia5string; ASN1_GENERALSTRING * generalstring; + ASN1_BMPSTRING * bmpstring; ASN1_UNIVERSALSTRING * universalstring; ASN1_UTCTIME * utctime; + ASN1_GENERALIZEDTIME * generalizedtime; /* set and sequence are left complete and still * contain the set or sequence bytes */ ASN1_STRING * set; @@ -272,6 +239,7 @@ typedef struct asn1_header_st ASN1_METHOD *meth; } ASN1_HEADER; +#define ASN1_STRING_length(x) ((x)->length) #define ASN1_STRING_type(x) ((x)->type) #define ASN1_STRING_data(x) ((x)->data) @@ -298,6 +266,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) @@ -321,10 +300,12 @@ typedef struct asn1_header_st B_ASN1_PRINTABLESTRING| \ B_ASN1_T61STRING| \ B_ASN1_IA5STRING| \ + B_ASN1_BIT_STRING| \ B_ASN1_UNIVERSALSTRING|\ + B_ASN1_BMPSTRING|\ B_ASN1_UNKNOWN) -#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING_STRING *)\ +#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) \ @@ -362,7 +343,26 @@ typedef struct asn1_header_st /* d2i_ASN1_UTCTIME() is a function */ /* ASN1_UTCTIME_set() is a function */ /* ASN1_UTCTIME_check() is a function */ -/* ASN1_UTCTIME_set() is a function */ + +#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_GENERALIZEDTIME *)ASN1_STRING_dup(\ + (ASN1_STRING *)a) +/* 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) @@ -384,6 +384,16 @@ typedef struct asn1_header_st (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\ ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING) +#define ASN1_BMPSTRING_new() (ASN1_BMPSTRING *)\ + ASN1_STRING_type_new(V_ASN1_BMPSTRING) +#define ASN1_BMPSTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a) +#define M_i2d_ASN1_BMPSTRING(a,pp) \ + i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\ + V_ASN1_UNIVERSAL) +#define M_d2i_ASN1_BMPSTRING(a,pp,l) \ + (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\ + ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING) + #ifndef NOPROTO ASN1_TYPE * ASN1_TYPE_new(void ); void ASN1_TYPE_free(ASN1_TYPE *a); @@ -408,6 +418,9 @@ int ASN1_STRING_set(ASN1_STRING *str,unsigned char *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, long length); +int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value); +int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n); + int i2d_ASN1_BOOLEAN(int a,unsigned char **pp); int d2i_ASN1_BOOLEAN(int *a,unsigned char **pp,long length); @@ -416,13 +429,26 @@ int i2d_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp); ASN1_INTEGER *d2i_ASN1_INTEGER(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_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); @@ -439,18 +465,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); + + /* for the is_set parameter to i2d_ASN1_SET */ +#define IS_SEQUENCE 0 +#define IS_SET 1 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); ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len, @@ -461,6 +501,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); @@ -486,7 +531,7 @@ int ASN1_object_size(int constructed, int length, int tag); /* Used to implement other functions */ char *ASN1_dup(int (*i2d)(),char *(*d2i)(),char *x); -#ifndef WIN16 +#ifndef NO_FP_API char *ASN1_d2i_fp(char *(*xnew)(),char *(*d2i)(),FILE *fp,unsigned char **x); int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x); #endif @@ -495,6 +540,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 @@ -515,6 +562,15 @@ ASN1_METHOD *RSAPrivateKey_asn1_meth(void); ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void); ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(void); +int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, + unsigned char *data, int len); +int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, + unsigned char *data, int max_len); +int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, + unsigned char *data, int len); +int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num, + unsigned char *data, int max_len); + #else ASN1_TYPE * ASN1_TYPE_new(); @@ -536,12 +592,20 @@ 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 i2d_ASN1_ENUMERATED(); +ASN1_INTEGER *d2i_ASN1_ENUMERATED(); int ASN1_UTCTIME_check(); ASN1_UTCTIME *ASN1_UTCTIME_set(); +int ASN1_UTCTIME_set_string(); +int ASN1_GENERALIZEDTIME_check(); +ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(); +int ASN1_GENERALIZEDTIME_set_string(); int i2d_ASN1_OCTET_STRING(); ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING(); int i2d_ASN1_PRINTABLE(); @@ -552,6 +616,10 @@ int i2d_ASN1_IA5STRING(); ASN1_IA5STRING *d2i_ASN1_IA5STRING(); int i2d_ASN1_UTCTIME(); ASN1_UTCTIME * d2i_ASN1_UTCTIME(); +int i2d_ASN1_GENERALIZEDTIME(); +ASN1_GENERALIZEDTIME * d2i_ASN1_GENERALIZEDTIME(); +int i2d_ASN1_TIME(); +ASN1_TIME * d2i_ASN1_TIME(); int i2d_ASN1_SET(); STACK * d2i_ASN1_SET(); int a2d_ASN1_OBJECT(); @@ -560,6 +628,10 @@ int ASN1_INTEGER_set(); long ASN1_INTEGER_get(); ASN1_INTEGER *BN_to_ASN1_INTEGER(); BIGNUM *ASN1_INTEGER_to_BN(); +int ASN1_ENUMERATED_set(); +long ASN1_ENUMERATED_get(); +ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(); +BIGNUM *ASN1_ENUMERATED_to_BN(); int ASN1_PRINTABLE_type(); int i2d_ASN1_bytes(); ASN1_STRING *d2i_ASN1_bytes(); @@ -570,7 +642,7 @@ int ASN1_check_infinite_end(); void ASN1_put_object(); int ASN1_object_size(); char *ASN1_dup(); -#ifndef WIN16 +#ifndef NO_FP_API char *ASN1_d2i_fp(); int ASN1_i2d_fp(); #endif @@ -578,11 +650,16 @@ int ASN1_i2d_fp(); char *ASN1_d2i_bio(); int ASN1_i2d_bio(); int ASN1_UTCTIME_print(); +int ASN1_GENERALIZEDTIME_print(); +int ASN1_TIME_print(); int ASN1_STRING_print(); int ASN1_parse(); int i2a_ASN1_INTEGER(); int a2i_ASN1_INTEGER(); +int i2a_ASN1_ENUMERATED(); +int a2i_ASN1_ENUMERATED(); int i2a_ASN1_OBJECT(); +int i2t_ASN1_OBJECT(); int a2i_ASN1_STRING(); int i2a_ASN1_STRING(); @@ -597,6 +674,15 @@ 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(); + +int i2d_ASN1_BMPSTRING(); +ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); + #endif /* BEGIN ERROR CODES */ @@ -604,12 +690,16 @@ int ASN1_UNIVERSALSTRING_to_string(); /* 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_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 @@ -620,164 +710,181 @@ int ASN1_UNIVERSALSTRING_to_string(); #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_NEW 117 -#define ASN1_F_ASN1_UTCTIME_NEW 118 -#define ASN1_F_ASN1_VERIFY 119 -#define ASN1_F_BN_TO_ASN1_INTEGER 120 -#define ASN1_F_D2I_ASN1_BIT_STRING 121 -#define ASN1_F_D2I_ASN1_BOOLEAN 122 -#define ASN1_F_D2I_ASN1_BYTES 123 -#define ASN1_F_D2I_ASN1_HEADER 124 -#define ASN1_F_D2I_ASN1_INTEGER 125 -#define ASN1_F_D2I_ASN1_OBJECT 126 -#define ASN1_F_D2I_ASN1_OCTET_STRING 127 -#define ASN1_F_D2I_ASN1_PRINT_TYPE 128 -#define ASN1_F_D2I_ASN1_SET 129 -#define ASN1_F_D2I_ASN1_TYPE 130 -#define ASN1_F_D2I_ASN1_TYPE_BYTES 131 -#define ASN1_F_D2I_ASN1_UTCTIME 132 -#define ASN1_F_D2I_DHPARAMS 133 -#define ASN1_F_D2I_DSAPARAMS 134 -#define ASN1_F_D2I_DSAPRIVATEKEY 135 -#define ASN1_F_D2I_DSAPUBLICKEY 136 -#define ASN1_F_D2I_NETSCAPE_PKEY 137 -#define ASN1_F_D2I_NETSCAPE_RSA 138 -#define ASN1_F_D2I_NETSCAPE_RSA_2 139 -#define ASN1_F_D2I_NETSCAPE_SPKAC 140 -#define ASN1_F_D2I_NETSCAPE_SPKI 141 -#define ASN1_F_D2I_PKCS7 142 -#define ASN1_F_D2I_PKCS7_DIGEST 143 -#define ASN1_F_D2I_PKCS7_ENCRYPT 144 -#define ASN1_F_D2I_PKCS7_ENC_CONTENT 145 -#define ASN1_F_D2I_PKCS7_ENVELOPE 146 -#define ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL 147 -#define ASN1_F_D2I_PKCS7_RECIP_INFO 148 -#define ASN1_F_D2I_PKCS7_SIGNED 149 -#define ASN1_F_D2I_PKCS7_SIGNER_INFO 150 -#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE 151 -#define ASN1_F_D2I_PRIVATEKEY 152 -#define ASN1_F_D2I_PUBLICKEY 153 -#define ASN1_F_D2I_RSAPRIVATEKEY 154 -#define ASN1_F_D2I_RSAPUBLICKEY 155 -#define ASN1_F_D2I_X509 156 -#define ASN1_F_D2I_X509_ALGOR 157 -#define ASN1_F_D2I_X509_ATTRIBUTE 158 -#define ASN1_F_D2I_X509_CINF 159 -#define ASN1_F_D2I_X509_CRL 160 -#define ASN1_F_D2I_X509_CRL_INFO 161 -#define ASN1_F_D2I_X509_EXTENSION 162 -#define ASN1_F_D2I_X509_KEY 163 -#define ASN1_F_D2I_X509_NAME 164 -#define ASN1_F_D2I_X509_NAME_ENTRY 165 -#define ASN1_F_D2I_X509_PKEY 166 -#define ASN1_F_D2I_X509_PUBKEY 167 -#define ASN1_F_D2I_X509_REQ 168 -#define ASN1_F_D2I_X509_REQ_INFO 169 -#define ASN1_F_D2I_X509_REVOKED 170 -#define ASN1_F_D2I_X509_SIG 171 -#define ASN1_F_D2I_X509_VAL 172 -#define ASN1_F_I2A_ASN1_OBJECT 173 -#define ASN1_F_I2D_ASN1_HEADER 174 -#define ASN1_F_I2D_DHPARAMS 175 -#define ASN1_F_I2D_DSAPARAMS 176 -#define ASN1_F_I2D_DSAPRIVATEKEY 177 -#define ASN1_F_I2D_DSAPUBLICKEY 178 -#define ASN1_F_I2D_NETSCAPE_RSA 179 -#define ASN1_F_I2D_PKCS7 180 -#define ASN1_F_I2D_PRIVATEKEY 181 -#define ASN1_F_I2D_PUBLICKEY 182 -#define ASN1_F_I2D_RSAPRIVATEKEY 183 -#define ASN1_F_I2D_RSAPUBLICKEY 184 -#define ASN1_F_I2D_X509_ATTRIBUTE 185 -#define ASN1_F_NETSCAPE_PKEY_NEW 186 -#define ASN1_F_NETSCAPE_SPKAC_NEW 187 -#define ASN1_F_NETSCAPE_SPKI_NEW 188 -#define ASN1_F_PKCS7_DIGEST_NEW 189 -#define ASN1_F_PKCS7_ENCRYPT_NEW 190 -#define ASN1_F_PKCS7_ENC_CONTENT_NEW 191 -#define ASN1_F_PKCS7_ENVELOPE_NEW 192 -#define ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW 193 -#define ASN1_F_PKCS7_NEW 194 -#define ASN1_F_PKCS7_RECIP_INFO_NEW 195 -#define ASN1_F_PKCS7_SIGNED_NEW 196 -#define ASN1_F_PKCS7_SIGNER_INFO_NEW 197 -#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW 198 -#define ASN1_F_X509_ALGOR_NEW 199 -#define ASN1_F_X509_ATTRIBUTE_NEW 200 -#define ASN1_F_X509_CINF_NEW 201 -#define ASN1_F_X509_CRL_INFO_NEW 202 -#define ASN1_F_X509_CRL_NEW 203 -#define ASN1_F_X509_DHPARAMS_NEW 204 -#define ASN1_F_X509_EXTENSION_NEW 205 -#define ASN1_F_X509_INFO_NEW 206 -#define ASN1_F_X509_KEY_NEW 207 -#define ASN1_F_X509_NAME_ENTRY_NEW 208 -#define ASN1_F_X509_NAME_NEW 209 -#define ASN1_F_X509_NEW 210 -#define ASN1_F_X509_PKEY_NEW 211 -#define ASN1_F_X509_PUBKEY_NEW 212 -#define ASN1_F_X509_REQ_INFO_NEW 213 -#define ASN1_F_X509_REQ_NEW 214 -#define ASN1_F_X509_REVOKED_NEW 215 -#define ASN1_F_X509_SIG_NEW 216 -#define ASN1_F_X509_VAL_FREE 217 -#define ASN1_F_X509_VAL_NEW 218 +#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_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_UTCTIME 135 +#define ASN1_F_D2I_AUTHORITY_KEYID 238 +#define ASN1_F_D2I_BASIC_CONSTRAINTS 227 +#define ASN1_F_D2I_DHPARAMS 136 +#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_PKCS7 145 +#define ASN1_F_D2I_PKCS7_DIGEST 146 +#define ASN1_F_D2I_PKCS7_ENCRYPT 147 +#define ASN1_F_D2I_PKCS7_ENC_CONTENT 148 +#define ASN1_F_D2I_PKCS7_ENVELOPE 149 +#define ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL 150 +#define ASN1_F_D2I_PKCS7_RECIP_INFO 151 +#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_PRIVATEKEY 155 +#define ASN1_F_D2I_PUBLICKEY 156 +#define ASN1_F_D2I_RSAPRIVATEKEY 157 +#define ASN1_F_D2I_RSAPUBLICKEY 158 +#define ASN1_F_D2I_X509 159 +#define ASN1_F_D2I_X509_ALGOR 160 +#define ASN1_F_D2I_X509_ATTRIBUTE 161 +#define ASN1_F_D2I_X509_CINF 162 +#define ASN1_F_D2I_X509_CRL 163 +#define ASN1_F_D2I_X509_CRL_INFO 164 +#define ASN1_F_D2I_X509_EXTENSION 165 +#define ASN1_F_D2I_X509_KEY 166 +#define ASN1_F_D2I_X509_NAME 167 +#define ASN1_F_D2I_X509_NAME_ENTRY 168 +#define ASN1_F_D2I_X509_PKEY 169 +#define ASN1_F_D2I_X509_PUBKEY 170 +#define ASN1_F_D2I_X509_REQ 171 +#define ASN1_F_D2I_X509_REQ_INFO 172 +#define ASN1_F_D2I_X509_REVOKED 173 +#define ASN1_F_D2I_X509_SIG 174 +#define ASN1_F_D2I_X509_VAL 175 +#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 +#define ASN1_F_I2D_DSAPUBLICKEY 180 +#define ASN1_F_I2D_NETSCAPE_RSA 181 +#define ASN1_F_I2D_PKCS7 182 +#define ASN1_F_I2D_PRIVATEKEY 183 +#define ASN1_F_I2D_PUBLICKEY 184 +#define ASN1_F_I2D_RSAPRIVATEKEY 185 +#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_PKCS7_DIGEST_NEW 192 +#define ASN1_F_PKCS7_ENCRYPT_NEW 193 +#define ASN1_F_PKCS7_ENC_CONTENT_NEW 194 +#define ASN1_F_PKCS7_ENVELOPE_NEW 195 +#define ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW 196 +#define ASN1_F_PKCS7_NEW 197 +#define ASN1_F_PKCS7_RECIP_INFO_NEW 198 +#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_X509_ALGOR_NEW 202 +#define ASN1_F_X509_ATTRIBUTE_NEW 203 +#define ASN1_F_X509_CINF_NEW 204 +#define ASN1_F_X509_CRL_INFO_NEW 205 +#define ASN1_F_X509_CRL_NEW 206 +#define ASN1_F_X509_DHPARAMS_NEW 207 +#define ASN1_F_X509_EXTENSION_NEW 208 +#define ASN1_F_X509_INFO_NEW 209 +#define ASN1_F_X509_KEY_NEW 210 +#define ASN1_F_X509_NAME_ENTRY_NEW 211 +#define ASN1_F_X509_NAME_NEW 212 +#define ASN1_F_X509_NEW 213 +#define ASN1_F_X509_PKEY_NEW 214 +#define ASN1_F_X509_PUBKEY_NEW 215 +#define ASN1_F_X509_REQ_INFO_NEW 216 +#define ASN1_F_X509_REQ_NEW 217 +#define ASN1_F_X509_REVOKED_NEW 218 +#define ASN1_F_X509_SIG_NEW 219 +#define ASN1_F_X509_VAL_FREE 220 +#define ASN1_F_X509_VAL_NEW 221 /* 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_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_DECODING_ERROR 111 -#define ASN1_R_ERROR_STACK 112 +#define ASN1_R_ERROR_PARSING_SET_ELEMENT 112 +#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_SEQUENCE 118 -#define ASN1_R_EXPECTING_A_UTCTIME 119 -#define ASN1_R_FIRST_NUM_TOO_LARGE 120 -#define ASN1_R_HEADER_TOO_LONG 121 -#define ASN1_R_INVALID_DIGIT 122 -#define ASN1_R_INVALID_SEPARATOR 123 -#define ASN1_R_INVALID_TIME_FORMAT 124 -#define ASN1_R_IV_TOO_LARGE 125 -#define ASN1_R_LENGTH_ERROR 126 -#define ASN1_R_LENGTH_MISMATCH 127 -#define ASN1_R_MISSING_EOS 128 -#define ASN1_R_MISSING_SECOND_NUMBER 129 -#define ASN1_R_NON_HEX_CHARACTERS 130 -#define ASN1_R_NOT_ENOUGH_DATA 131 -#define ASN1_R_ODD_NUMBER_OF_CHARS 132 -#define ASN1_R_PARSING 133 -#define ASN1_R_PRIVATE_KEY_HEADER_MISSING 134 -#define ASN1_R_SECOND_NUMBER_TOO_LARGE 135 -#define ASN1_R_SHORT_LINE 136 -#define ASN1_R_STRING_TOO_SHORT 137 -#define ASN1_R_TAG_VALUE_TOO_HIGH 138 -#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 139 -#define ASN1_R_TOO_LONG 140 -#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 141 -#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 142 -#define ASN1_R_UNKNOWN_ATTRIBUTE_TYPE 143 -#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 144 -#define ASN1_R_UNKNOWN_OBJECT_TYPE 145 -#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE 146 -#define ASN1_R_UNSUPPORTED_CIPHER 147 -#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM 148 -#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 149 -#define ASN1_R_UTCTIME_TOO_LONG 150 -#define ASN1_R_WRONG_PRINTABLE_TYPE 151 -#define ASN1_R_WRONG_TAG 152 -#define ASN1_R_WRONG_TYPE 153 +#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 }