X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509v3%2Fx509v3.h;h=6c3937d0f361dd4b266915b4f22ba2e927455ffa;hp=52037eccb34558fa2a58bdf118cbe4216315779d;hb=3edd7ed15de229230f74c79c3d71e7c9c674cf4f;hpb=cfdcfede9cfb0c5f649f379255eea19b37f43f4f diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 52037eccb3..6c3937d0f3 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -137,8 +137,8 @@ typedef struct v3_ext_ctx X509V3_CTX; 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; @@ -197,9 +197,43 @@ typedef struct SXNET_st { STACK_OF(SXNETID) *ids; } SXNET; +typedef struct NOTICEREF_st { + ASN1_STRING *organization; + STACK *noticenos; +} NOTICEREF; + +typedef struct USERNOTICE_st { + NOTICEREF *noticeref; + ASN1_STRING *exptext; +} USERNOTICE; + +typedef struct POLICYQUALINFO_st { + ASN1_OBJECT *pqualid; + union { + ASN1_IA5STRING *cpsuri; + USERNOTICE *usernotice; + ASN1_TYPE *other; + } d; +} POLICYQUALINFO; + +DECLARE_STACK_OF(POLICYQUALINFO) +DECLARE_ASN1_SET_OF(POLICYQUALINFO) + +typedef struct POLICYINFO_st { + ASN1_OBJECT *policyid; + STACK_OF(POLICYQUALINFO) *qualifiers; +} POLICYINFO; + +DECLARE_STACK_OF(POLICYINFO) +DECLARE_ASN1_SET_OF(POLICYINFO) + #define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \ ",name:", val->name, ",value:", val->value); +#define X509V3_set_ctx_test(ctx) \ + X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST) +#define X509V3_set_ctx_nodb(ctx) ctx->db = NULL; + #define EXT_BITSTRING(nid, table) { nid, 0, \ (X509V3_EXT_NEW)asn1_bit_string_new, ASN1_STRING_free, \ (X509V3_EXT_D2I)d2i_ASN1_BIT_STRING, \ @@ -279,6 +313,32 @@ STACK *d2i_ext_ku(STACK **a, unsigned char **pp, long length); void ext_ku_free(STACK *a); STACK *ext_ku_new(void); +int i2d_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) *a, unsigned char **pp); +STACK_OF(POLICYINFO) *CERTIFICATEPOLICIES_new(void); +void CERTIFICATEPOLICIES_free(STACK_OF(POLICYINFO) *a); +STACK_OF(POLICYINFO) *d2i_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) **a, unsigned char **pp, long length); + +int i2d_POLICYINFO(POLICYINFO *a, unsigned char **pp); +POLICYINFO *POLICYINFO_new(void); +POLICYINFO *d2i_POLICYINFO(POLICYINFO **a, unsigned char **pp, long length); +void POLICYINFO_free(POLICYINFO *a); + +int i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **pp); +POLICYQUALINFO *POLICYQUALINFO_new(void); +POLICYQUALINFO *d2i_POLICYQUALINFO(POLICYQUALINFO **a, unsigned char **pp, + long length); +void POLICYQUALINFO_free(POLICYQUALINFO *a); + +int i2d_USERNOTICE(USERNOTICE *a, unsigned char **pp); +USERNOTICE *USERNOTICE_new(void); +USERNOTICE *d2i_USERNOTICE(USERNOTICE **a, unsigned char **pp, long length); +void USERNOTICE_free(USERNOTICE *a); + +int i2d_NOTICEREF(NOTICEREF *a, unsigned char **pp); +NOTICEREF *NOTICEREF_new(void); +NOTICEREF *d2i_NOTICEREF(NOTICEREF **a, unsigned char **pp, long length); +void NOTICEREF_free(NOTICEREF *a); + #ifdef HEADER_CONF_H GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, CONF_VALUE *cnf); void X509V3_conf_free(CONF_VALUE *val); @@ -286,7 +346,6 @@ X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, c 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); @@ -294,14 +353,14 @@ void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash); 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_string_free(X509V3_CTX *ctx, char *str); +void X509V3_section_free( 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(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); +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); @@ -318,7 +377,7 @@ 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 indent); int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent); @@ -364,8 +423,8 @@ PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(); PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(); void PKEY_USAGE_PERIOD_free(); -STACK *GENERAL_NAMES_new(): -void GENERAL_NAMES_free(): +STACK *GENERAL_NAMES_new(); +void GENERAL_NAMES_free(); STACK *d2i_GENERAL_NAMES(); int i2d_GENERAL_NAMES(); STACK *i2v_GENERAL_NAMES(); @@ -384,16 +443,40 @@ void X509V3_conf_free(); X509_EXTENSION *X509V3_EXT_conf_nid(); X509_EXTENSION *X509V3_EXT_conf(); 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 +int i2d_CERTIFICATEPOLICIES(); +STACK *CERTIFICATEPOLICIES_new(); +void CERTIFICATEPOLICIES_free(); +STACK *d2i_CERTIFICATEPOLICIES(); + +int i2d_POLICYINFO(); +POLICYINFO *POLICYINFO_new(); +POLICYINFO *d2i_POLICYINFO(); +void POLICYINFO_free(); + +int i2d_POLICYQUALINFO(); +POLICYQUALINFO *POLICYQUALINFO_new(); +POLICYQUALINFO *d2i_POLICYQUALINFO(); +void POLICYQUALINFO_free(); + +int i2d_USERNOTICE(); +USERNOTICE *USERNOTICE_new(); +USERNOTICE *d2i_USERNOTICE(); +void USERNOTICE_free(); + +int i2d_NOTICEREF(); +NOTICEREF *NOTICEREF_new(); +NOTICEREF *d2i_NOTICEREF(); +void NOTICEREF_free(); + char * X509V3_get_string(); STACK * X509V3_get_section(); -void X509V3_free_string(); -void X509V3_free_section(); +void X509V3_string_free(); +void X509V3_section_free(); void X509V3_set_ctx(); int X509V3_add_value(); @@ -432,6 +515,10 @@ int X509V3_EXT_print_fp(); #define X509V3_F_HEX_TO_STRING 111 #define X509V3_F_I2S_ASN1_ENUMERATED 121 #define X509V3_F_I2S_ASN1_INTEGER 120 +#define X509V3_F_NOTICE_SECTION 132 +#define X509V3_F_NREF_NOS 133 +#define X509V3_F_POLICY_SECTION 131 +#define X509V3_F_R2I_CERTPOL 130 #define X509V3_F_S2I_ASN1_IA5STRING 100 #define X509V3_F_S2I_ASN1_INTEGER 108 #define X509V3_F_S2I_ASN1_OCTET_STRING 112 @@ -450,12 +537,12 @@ 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_EXT_ADD 104 #define X509V3_F_X509V3_ADD_VALUE 105 +#define X509V3_F_X509V3_EXT_ADD 104 #define X509V3_F_X509V3_EXT_ADD_ALIAS 106 #define X509V3_F_X509V3_EXT_CONF 107 -#define X509V3_F_X509V3_PARSE_LIST 109 #define X509V3_F_X509V3_GET_VALUE_BOOL 110 +#define X509V3_F_X509V3_PARSE_LIST 109 /* Reason codes. */ #define X509V3_R_BAD_IP_ADDRESS 118 @@ -465,6 +552,7 @@ int X509V3_EXT_print_fp(); #define X509V3_R_DUPLICATE_ZONE_ID 133 #define X509V3_R_ERROR_CONVERTING_ZONE 131 #define X509V3_R_ERROR_IN_EXTENSION 128 +#define X509V3_R_EXPECTED_A_SECTION_NAME 137 #define X509V3_R_EXTENSION_NAME_ERROR 115 #define X509V3_R_EXTENSION_NOT_FOUND 102 #define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103 @@ -476,11 +564,19 @@ int X509V3_EXT_print_fp(); #define X509V3_R_INVALID_NULL_ARGUMENT 107 #define X509V3_R_INVALID_NULL_NAME 108 #define X509V3_R_INVALID_NULL_VALUE 109 +#define X509V3_R_INVALID_NUMBER 140 +#define X509V3_R_INVALID_NUMBERS 141 #define X509V3_R_INVALID_OBJECT_IDENTIFIER 110 +#define X509V3_R_INVALID_OPTION 138 +#define X509V3_R_INVALID_POLICY_IDENTIFIER 134 +#define X509V3_R_INVALID_SECTION 135 #define X509V3_R_ISSUER_DECODE_ERROR 126 #define X509V3_R_MISSING_VALUE 124 +#define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142 +#define X509V3_R_NO_CONFIG_DATABASE 136 #define X509V3_R_NO_ISSUER_CERTIFICATE 121 #define X509V3_R_NO_ISSUER_DETAILS 127 +#define X509V3_R_NO_POLICY_IDENTIFIER 139 #define X509V3_R_NO_PUBLIC_KEY 114 #define X509V3_R_NO_SUBJECT_DETAILS 125 #define X509V3_R_ODD_NUMBER_OF_DIGITS 112