X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fasn1%2Fasn1.h;h=c3cd6273f69595039f0018b1e66920ddbb6fcecd;hp=0aa1ca043dba192cbf91dd1b8e66c7fdaf415299;hb=834eeef995bb3783550d11186f9d649aaacd43ac;hpb=dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 0aa1ca043d..c3cd6273f6 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -175,6 +175,7 @@ typedef struct asn1_string_st #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 @@ -189,6 +190,7 @@ 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 @@ -330,12 +332,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) @@ -406,6 +418,10 @@ 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); @@ -430,8 +446,18 @@ 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)(), void (*free_func)(), int ex_tag, int ex_class); @@ -488,6 +514,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 @@ -547,6 +575,9 @@ ASN1_INTEGER *d2i_ASN1_INTEGER(); 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(); @@ -557,6 +588,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(); @@ -583,6 +618,8 @@ 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(); @@ -625,6 +662,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); #define ASN1_F_ASN1_D2I_BIO 104 #define ASN1_F_ASN1_D2I_FP 105 #define ASN1_F_ASN1_DUP 106 +#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 @@ -640,20 +678,24 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); #define ASN1_F_ASN1_TYPE_NEW 119 #define ASN1_F_ASN1_UTCTIME_NEW 120 #define ASN1_F_ASN1_VERIFY 121 +#define ASN1_F_BASIC_CONSTRAINTS_NEW 226 #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_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_BASIC_CONSTRAINTS 227 #define ASN1_F_D2I_DHPARAMS 136 #define ASN1_F_D2I_DSAPARAMS 137 #define ASN1_F_D2I_DSAPRIVATEKEY 138 @@ -695,6 +737,7 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); #define ASN1_F_D2I_X509_SIG 174 #define ASN1_F_D2I_X509_VAL 175 #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 @@ -760,8 +803,11 @@ ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); #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