des_cbc_encrypt / des_ncbc_encrypt issue.
[openssl.git] / crypto / x509v3 / x509v3.h
index 5b19ff4e5d35cafde2487c053f13686a16b9b598..f80dc74682c585e999a7ea1321ceed7c880a7363 100644 (file)
@@ -62,8 +62,8 @@
 extern "C" {
 #endif
 
-#include "bio.h"
-#include "x509.h"
+#include <openssl/bio.h>
+#include <openssl/x509.h>
 
 /* Forward reference */
 struct v3_ext_method;
@@ -104,7 +104,7 @@ X509V3_EXT_V2I v2i;
 X509V3_EXT_I2R i2r;
 X509V3_EXT_R2I r2i;
 
-char *usr_data;        /* Any extension specific data */
+void *usr_data;        /* Any extension specific data */
 };
 
 typedef struct X509V3_CONF_METHOD_st {
@@ -276,7 +276,6 @@ DECLARE_ASN1_SET_OF(POLICYINFO)
                         NULL, NULL, NULL, NULL, \
                         NULL}
 
-#ifndef NOPROTO
 void ERR_load_X509V3_strings(void);
 int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp);
 BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a, unsigned char **pp, long length);
@@ -382,6 +381,7 @@ 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_add_value_bool_nf(char *name, int asn1_bool, STACK **extlist);
 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);
@@ -404,6 +404,7 @@ 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);
+int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
 int X509V3_EXT_add_alias(int nid_to, int nid_from);
 void X509V3_EXT_cleanup(void);
 
@@ -412,144 +413,28 @@ X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
 int X509V3_add_standard_extensions(void);
 STACK *X509V3_parse_list(char *line);
 void *X509V3_EXT_d2i(X509_EXTENSION *ext);
+X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
 
 char *hex_to_string(unsigned char *buffer, long len);
 unsigned char *string_to_hex(char *str, long *len);
 int name_cmp(const char *name, const char *cmp);
 
+void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml);
 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
-
-void ERR_load_X509V3_strings();
-int i2d_BASIC_CONSTRAINTS();
-BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS();
-BASIC_CONSTRAINTS *BASIC_CONSTRAINTS_new();
-void BASIC_CONSTRAINTS_free();
-
-int i2d_GENERAL_NAME();
-GENERAL_NAME *d2i_GENERAL_NAME();
-GENERAL_NAME *GENERAL_NAME_new();
-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();
-void PKEY_USAGE_PERIOD_free();
-
-STACK *GENERAL_NAMES_new();
-void GENERAL_NAMES_free();
-STACK *d2i_GENERAL_NAMES();
-int i2d_GENERAL_NAMES();
-STACK *i2v_GENERAL_NAMES();
-STACK *v2i_GENERAL_NAMES();
-
-char *i2s_ASN1_OCTET_STRING();
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING();
-
-int i2d_ext_ku();
-STACK *d2i_ext_ku();
-void ext_ku_free();
-STACK *ext_ku_new();
-
-#ifdef HEADER_CONF_H
-void X509V3_conf_free();
-X509_EXTENSION *X509V3_EXT_conf_nid();
-X509_EXTENSION *X509V3_EXT_conf();
-int X509V3_EXT_add_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_string_free();
-void X509V3_section_free();
-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();
-
-X509V3_EXT_METHOD *X509V3_EXT_get();
-X509V3_EXT_METHOD *X509V3_EXT_get_nid();
-int X509V3_add_standard_extensions();
-STACK *X509V3_parse_list();
-void *X509V3_EXT_d2i();
-
-char *hex_to_string();
-unsigned char *string_to_hex();
-int name_cmp();
-
-int X509V3_EXT_print();
-int X509V3_EXT_print_fp();
-#endif
-
 /* 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 X509V3 functions. */
 
 /* Function codes. */
 #define X509V3_F_COPY_EMAIL                             122
 #define X509V3_F_COPY_ISSUER                            123
 #define X509V3_F_DO_EXT_CONF                            124
+#define X509V3_F_DO_EXT_I2D                             135
 #define X509V3_F_HEX_TO_STRING                          111
 #define X509V3_F_I2S_ASN1_ENUMERATED                    121
 #define X509V3_F_I2S_ASN1_INTEGER                       120
@@ -580,6 +465,7 @@ int X509V3_EXT_print_fp();
 #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_EXT_I2D                                 136
 #define X509V3_F_X509V3_GET_VALUE_BOOL                  110
 #define X509V3_F_X509V3_PARSE_LIST                      109
 
@@ -627,7 +513,7 @@ int X509V3_EXT_print_fp();
 #define X509V3_R_UNKNOWN_OPTION                                 120
 #define X509V3_R_UNSUPPORTED_OPTION                     117
 #define X509V3_R_USER_TOO_LONG                          132
+
 #ifdef  __cplusplus
 }
 #endif