X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509v3%2Fx509v3.h;h=63c85742209350f7c687e43b02eac0e03b7ded77;hp=1f25fc8f86b3e3078a0ae0ad411de9f08bc10825;hb=e778802f53c8d47e96a6e4cbc776eb6e1d4c461a;hpb=9985bed331b388e871a89cf043ae21c1177eaa24 diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 1f25fc8f86..63c8574220 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -79,7 +79,8 @@ typedef STACK * (*X509V3_EXT_I2V)(struct v3_ext_method *method, char *ext, STACK typedef char * (*X509V3_EXT_V2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, STACK *values); typedef char * (*X509V3_EXT_I2S)(struct v3_ext_method *method, char *ext); typedef char * (*X509V3_EXT_S2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str); -typedef int (*X509V3_EXT_I2R)(struct v3_ext_method *method, char *ext, BIO *out); +typedef int (*X509V3_EXT_I2R)(struct v3_ext_method *method, char *ext, BIO *out, int indent); +typedef char * (*X509V3_EXT_R2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str); /* V3 extension structure */ @@ -99,12 +100,19 @@ X509V3_EXT_S2I s2i; X509V3_EXT_I2V i2v; X509V3_EXT_V2I v2i; -/* The following is used for raw extensions */ +/* The following are used for raw extensions */ X509V3_EXT_I2R i2r; +X509V3_EXT_R2I r2i; char *usr_data; /* Any extension specific data */ }; +typedef struct X509V3_CONF_METHOD_st { +char * (*get_string)(void *db, char *section, char *value); +STACK * (*get_section)(void *db, char *section); +void (*free_string)(void *db, char * string); +void (*free_section)(void *db, STACK *section); +} X509V3_CONF_METHOD; /* Context specific info */ struct v3_ext_ctx { @@ -114,6 +122,8 @@ X509 *issuer_cert; X509 *subject_cert; X509_REQ *subject_req; X509_CRL *crl; +X509V3_CONF_METHOD *db_meth; +void *db; /* Maybe more here */ }; @@ -121,34 +131,35 @@ typedef struct v3_ext_method X509V3_EXT_METHOD; typedef struct v3_ext_ctx X509V3_CTX; /* ext_flags values */ -#define X509V3_EXT_DYNAMIC 0x1 -#define X509V3_EXT_CTX_DEP 0x2 +#define X509V3_EXT_DYNAMIC 0x1 +#define X509V3_EXT_CTX_DEP 0x2 +#define X509V3_EXT_MULTILINE 0x4 -typedef struct { +typedef struct BIT_STRING_BITNAME_st { int bitnum; -char *lname; -char *sname; +const char *lname; +const char *sname; } BIT_STRING_BITNAME; typedef BIT_STRING_BITNAME ENUMERATED_NAMES; -typedef struct { +typedef struct BASIC_CONSTRAINTS_st { int ca; ASN1_INTEGER *pathlen; } BASIC_CONSTRAINTS; -typedef struct { +typedef struct AUTHORITY_KEYID_st { ASN1_OCTET_STRING *keyid; STACK *issuer; ASN1_INTEGER *serial; } AUTHORITY_KEYID; -typedef struct { +typedef struct PKEY_USAGE_PERIOD_st { ASN1_GENERALIZEDTIME *notBefore; ASN1_GENERALIZEDTIME *notAfter; } PKEY_USAGE_PERIOD; -typedef struct { +typedef struct GENERAL_NAME_st { #define GEN_OTHERNAME (0|V_ASN1_CONTEXT_SPECIFIC) #define GEN_EMAIL (1|V_ASN1_CONTEXT_SPECIFIC) @@ -171,8 +182,20 @@ union { } d; } GENERAL_NAME; +/* Strong extranet structures */ +typedef struct SXNET_ID_st { + ASN1_INTEGER *zone; + ASN1_OCTET_STRING *user; +} SXNETID; +DECLARE_STACK_OF(SXNETID) +DECLARE_ASN1_SET_OF(SXNETID) + +typedef struct SXNET_st { + ASN1_INTEGER *version; + STACK_OF(SXNETID) *ids; +} SXNET; #define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \ ",name:", val->name, ",value:", val->value); @@ -184,7 +207,7 @@ union { NULL, NULL, \ (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \ (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \ - NULL, \ + NULL, NULL, \ (char *)table} #define EXT_IA5STRING(nid) { nid, 0, \ @@ -193,11 +216,11 @@ union { i2d_ASN1_IA5STRING, \ (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \ (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \ - NULL, NULL, NULL, \ + NULL, NULL, NULL, NULL, \ NULL} #define EXT_END { -1, 0, NULL, NULL, NULL, NULL, NULL, NULL, \ - NULL, NULL, NULL, \ + NULL, NULL, NULL, NULL, \ NULL} #ifndef NOPROTO @@ -213,6 +236,24 @@ GENERAL_NAME *GENERAL_NAME_new(void); void GENERAL_NAME_free(GENERAL_NAME *a); STACK *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK *ret); +int i2d_SXNET(SXNET *a, unsigned char **pp); +SXNET *d2i_SXNET(SXNET **a, unsigned char **pp, long length); +SXNET *SXNET_new(void); +void SXNET_free(SXNET *a); + +int i2d_SXNETID(SXNETID *a, unsigned char **pp); +SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length); +SXNETID *SXNETID_new(void); +void SXNETID_free(SXNETID *a); + +int SXNET_add_id_asc(SXNET **psx, char *zone, unsigned char *user, int userlen); +int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, unsigned char *user, int userlen); +int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, unsigned char *user, int userlen); + +ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone); +ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); +ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone); + int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp); AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp, long length); AUTHORITY_KEYID *AUTHORITY_KEYID_new(void); @@ -244,15 +285,25 @@ void X509V3_conf_free(CONF_VALUE *val); X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, char *value); X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value); int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509 *cert); +int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl); int X509V3_EXT_check_conf(LHASH *conf, char *section); int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool); int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint); +void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash); #endif -int X509V3_add_value(char *name, char *value, STACK **extlist); -int X509V3_add_value_bool(char *name, int asn1_bool, STACK **extlist); -int X509V3_add_value_int( char *name, ASN1_INTEGER *aint, STACK **extlist); +char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section); +STACK * X509V3_get_section(X509V3_CTX *ctx, char *section); +void X509V3_free_string(X509V3_CTX *ctx, char *str); +void X509V3_free_section( X509V3_CTX *ctx, STACK *section); +void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject, + X509_REQ *req, X509_CRL *crl, int flags); + +int X509V3_add_value(const char *name, const char *value, STACK **extlist); +int X509V3_add_value_bool(const char *name, int asn1_bool, STACK **extlist); +int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint, STACK **extlist); char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint); +ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value); char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint); char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint); int X509V3_EXT_add(X509V3_EXT_METHOD *ext); @@ -267,10 +318,10 @@ char *X509V3_EXT_d2i(X509_EXTENSION *ext); char *hex_to_string(unsigned char *buffer, long len); unsigned char *string_to_hex(char *str, long *len); -int name_cmp(char *name, char *cmp); +int name_cmp(const char *name, const char *cmp); -int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag); -int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag); +int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent); +int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); #else @@ -287,6 +338,27 @@ void GENERAL_NAME_free(); STACK *i2v_GENERAL_NAME(); GENERAL_NAME *v2i_GENERAL_NAME(); +int i2d_SXNET(); +SXNET *d2i_SXNET(); +SXNET *SXNET_new(); +void SXNET_free(); + +int i2d_SXNETID(); +SXNETID *d2i_SXNETID(); +SXNETID *SXNETID_new(); +void SXNETID_free(); +int SXNET_add_id_asc(); +int SXNET_add_id_ulong(); +int SXNET_add_id_INTEGER(); +ASN1_OCTET_STRING *SXNET_get_id_asc(); +ASN1_OCTET_STRING *SXNET_get_id_ulong(); +ASN1_OCTET_STRING *SXNET_get_id_INTEGER(); + +int i2d_AUTHORITY_KEYID(); +AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(); +AUTHORITY_KEYID *AUTHORITY_KEYID_new(); +void AUTHORITY_KEYID_free(); + int i2d_PKEY_USAGE_PERIOD(); PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(); PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(); @@ -315,15 +387,24 @@ int X509V3_EXT_add_conf(); int X509V3_EXT_check_conf(); int X509V3_get_value_bool(); int X509V3_get_value_int(); +void X509V3_set_conf_lhash(); #endif +char * X509V3_get_string(); +STACK * X509V3_get_section(); +void X509V3_free_string(); +void X509V3_free_section(); +void X509V3_set_ctx(); + int X509V3_add_value(); int X509V3_add_value_bool(); int X509V3_add_value_int(); char *i2s_ASN1_INTEGER(); +ASN1_INTEGER * s2i_ASN1_INTEGER(); char * i2s_ASN1_ENUMERATED(); char * i2s_ASN1_ENUMERATED_TABLE(); int X509V3_EXT_add(); +int X509V3_EXT_CRL_add_conf(); int X509V3_EXT_add_alias(); void X509V3_EXT_cleanup(); @@ -352,10 +433,16 @@ int X509V3_EXT_print_fp(); #define X509V3_F_I2S_ASN1_ENUMERATED 121 #define X509V3_F_I2S_ASN1_INTEGER 120 #define X509V3_F_S2I_ASN1_IA5STRING 100 +#define X509V3_F_S2I_ASN1_INTEGER 108 #define X509V3_F_S2I_ASN1_OCTET_STRING 112 #define X509V3_F_S2I_ASN1_SKEY_ID 114 #define X509V3_F_S2I_S2I_SKEY_ID 115 #define X509V3_F_STRING_TO_HEX 113 +#define X509V3_F_SXNET_ADD_ASC 125 +#define X509V3_F_SXNET_ADD_ID_INTEGER 126 +#define X509V3_F_SXNET_ADD_ID_ULONG 127 +#define X509V3_F_SXNET_GET_ID_ASC 128 +#define X509V3_F_SXNET_GET_ID_ULONG 129 #define X509V3_F_V2I_ASN1_BIT_STRING 101 #define X509V3_F_V2I_AUTHORITY_KEYID 119 #define X509V3_F_V2I_BASIC_CONSTRAINTS 102 @@ -363,19 +450,20 @@ int X509V3_EXT_print_fp(); #define X509V3_F_V2I_GENERAL_NAME 117 #define X509V3_F_V2I_GENERAL_NAMES 118 #define X509V3_F_V3_GENERIC_EXTENSION 116 -#define X509V3_F_X509V3_ADD_EXT 104 +#define X509V3_F_X509V3_EXT_ADD 104 #define X509V3_F_X509V3_ADD_VALUE 105 #define X509V3_F_X509V3_EXT_ADD_ALIAS 106 #define X509V3_F_X509V3_EXT_CONF 107 -#define X509V3_F_X509V3_GET_VALUE_INT 108 #define X509V3_F_X509V3_PARSE_LIST 109 -#define X509V3_F_X509V3_VALUE_GET_BOOL 110 +#define X509V3_F_X509V3_GET_VALUE_BOOL 110 /* Reason codes. */ #define X509V3_R_BAD_IP_ADDRESS 118 #define X509V3_R_BAD_OBJECT 119 #define X509V3_R_BN_DEC2BN_ERROR 100 #define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101 +#define X509V3_R_DUPLICATE_ZONE_ID 133 +#define X509V3_R_ERROR_CONVERTING_ZONE 131 #define X509V3_R_ERROR_IN_EXTENSION 128 #define X509V3_R_EXTENSION_NAME_ERROR 115 #define X509V3_R_EXTENSION_NOT_FOUND 102 @@ -403,6 +491,7 @@ int X509V3_EXT_print_fp(); #define X509V3_R_UNKNOWN_EXTENSION_NAME 130 #define X509V3_R_UNKNOWN_OPTION 120 #define X509V3_R_UNSUPPORTED_OPTION 117 +#define X509V3_R_USER_TOO_LONG 132 #ifdef __cplusplus }