diff options
author | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
---|---|---|
committer | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
commit | a9be3af5ad4836f7e50f0546311ca90c717b861e (patch) | |
tree | f44f7f8c4497d85da4c5cbd08067479bb20ced95 /crypto/x509v3 | |
parent | 47339f6179fbefafc793c10b0411ed0365497d65 (diff) |
Remove NOPROTO definitions and error code comments.
Diffstat (limited to 'crypto/x509v3')
-rw-r--r-- | crypto/x509v3/v3_akey.c | 13 | ||||
-rw-r--r-- | crypto/x509v3/v3_alt.c | 8 | ||||
-rw-r--r-- | crypto/x509v3/v3_bcons.c | 13 | ||||
-rw-r--r-- | crypto/x509v3/v3_bitst.c | 7 | ||||
-rw-r--r-- | crypto/x509v3/v3_conf.c | 10 | ||||
-rw-r--r-- | crypto/x509v3/v3_cpols.c | 11 | ||||
-rw-r--r-- | crypto/x509v3/v3_crld.c | 7 | ||||
-rw-r--r-- | crypto/x509v3/v3_extku.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3_genn.c | 5 | ||||
-rw-r--r-- | crypto/x509v3/v3_ia5.c | 7 | ||||
-rw-r--r-- | crypto/x509v3/v3_pku.c | 14 | ||||
-rw-r--r-- | crypto/x509v3/v3_skey.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3_sxnet.c | 12 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 140 |
14 files changed, 0 insertions, 259 deletions
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c index d17e3de650..72b023281f 100644 --- a/crypto/x509v3/v3_akey.c +++ b/crypto/x509v3/v3_akey.c @@ -63,17 +63,9 @@ #include <openssl/asn1_mac.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static STACK *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, AUTHORITY_KEYID *akeyid, STACK *extlist); static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *values); -#else - -static STACK *i2v_AUTHORITY_KEYID(); -static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(); - -#endif - X509V3_EXT_METHOD v3_akey_id = { NID_authority_key_identifier, X509V3_EXT_MULTILINE, (X509V3_EXT_NEW)AUTHORITY_KEYID_new, @@ -88,11 +80,6 @@ NULL }; -/* - * ASN1err(ASN1_F_AUTHORITY_KEYID_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE); - */ - int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c index efe9e5ee32..99026fc8bc 100644 --- a/crypto/x509v3/v3_alt.c +++ b/crypto/x509v3/v3_alt.c @@ -61,18 +61,10 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static STACK_OF(GENERAL_NAME) *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); static STACK_OF(GENERAL_NAME) *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens); static int copy_issuer(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens); -#else -static STACK *v2i_issuer_alt(); -static STACK *v2i_subject_alt(); -static int copy_email(); -static int copy_issuer(); -#endif - X509V3_EXT_METHOD v3_alt[] = { { NID_subject_alt_name, 0, (X509V3_EXT_NEW)GENERAL_NAMES_new, diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c index 457ee16edc..7e7c0e3ace 100644 --- a/crypto/x509v3/v3_bcons.c +++ b/crypto/x509v3/v3_bcons.c @@ -64,17 +64,9 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static STACK *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK *extlist); static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *values); -#else - -static STACK *i2v_BASIC_CONSTRAINTS(); -static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(); - -#endif - X509V3_EXT_METHOD v3_bcons = { NID_basic_constraints, 0, (X509V3_EXT_NEW)BASIC_CONSTRAINTS_new, @@ -89,11 +81,6 @@ NULL }; -/* - * ASN1err(ASN1_F_BASIC_CONSTRAINTS_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_BASIC_CONSTRAINTS,ERR_R_MALLOC_FAILURE); - */ - int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c index 35cbc821ab..29d8bd44ca 100644 --- a/crypto/x509v3/v3_bitst.c +++ b/crypto/x509v3/v3_bitst.c @@ -61,16 +61,9 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static ASN1_BIT_STRING *asn1_bit_string_new(void); static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); static STACK *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits, STACK *extlist); -#else -static ASN1_BIT_STRING *asn1_bit_string_new(); -static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(); -static STACK *i2v_ASN1_BIT_STRING(); -#endif - static BIT_STRING_BITNAME ns_cert_type_table[] = { {0, "SSL Client", "client"}, {1, "SSL Server", "server"}, diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index 29982e68c3..d63db97340 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -66,22 +66,12 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static int v3_check_critical(char **value); static int v3_check_generic(char **value); static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value); static X509_EXTENSION *v3_generic_extension(const char *ext, char *value, int crit, int type); static char *conf_lhash_get_string(void *db, char *section, char *value); static STACK *conf_lhash_get_section(void *db, char *section); -#else -static int v3_check_critical(); -static int v3_check_generic(); -static X509_EXTENSION *do_ext_conf(); -static X509V3_EXTENSION *v3_generic_extension(); -static char *conf_lhash_get_string(); -static STACK *conf_lhash_get_section(); -#endif - /* LHASH *conf: Config file */ /* char *name: Name */ /* char *value: Value */ diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c index 328c3c54b1..3580ffd14f 100644 --- a/crypto/x509v3/v3_cpols.c +++ b/crypto/x509v3/v3_cpols.c @@ -87,17 +87,6 @@ NULL }; -/* - * ASN1err(ASN1_F_POLICYINFO_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_POLICYINFO,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_POLICYQUALINFO_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_POLICYQUALINFO,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_USERNOTICE_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_USERNOTICE,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_NOTICEREF_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_NOTICEREF,ERR_R_MALLOC_FAILURE); - */ - static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *value) { diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509v3/v3_crld.c index 93c798c235..ece494489f 100644 --- a/crypto/x509v3/v3_crld.c +++ b/crypto/x509v3/v3_crld.c @@ -80,13 +80,6 @@ NULL, NULL, NULL, NULL, NULL }; -/* - * ASN1err(ASN1_F_DIST_POINT_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_DIST_POINT,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_DIST_POINT_NAME_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_DIST_POINT_NAME,ERR_R_MALLOC_FAILURE); - */ - static STACK *i2v_crld(X509V3_EXT_METHOD *method, STACK_OF(DIST_POINT) *crld, STACK *exts) { diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c index 73c7f391b5..dc3ebd5176 100644 --- a/crypto/x509v3/v3_extku.c +++ b/crypto/x509v3/v3_extku.c @@ -63,14 +63,8 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static STACK *v2i_ext_ku(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); static STACK *i2v_ext_ku(X509V3_EXT_METHOD *method, STACK *eku, STACK *extlist); -#else -static STACK *v2i_ext_ku(); -static STACK *i2v_ext_ku(); -#endif - X509V3_EXT_METHOD v3_ext_ku = { NID_ext_key_usage, 0, (X509V3_EXT_NEW)ext_ku_new, diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c index 1a58f73ab2..af716232f8 100644 --- a/crypto/x509v3/v3_genn.c +++ b/crypto/x509v3/v3_genn.c @@ -64,11 +64,6 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -/* - * ASN1err(ASN1_F_GENERAL_NAME_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE); - */ - int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp) { unsigned char *p; diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c index 81cc9baef0..3446c5cd6a 100644 --- a/crypto/x509v3/v3_ia5.c +++ b/crypto/x509v3/v3_ia5.c @@ -63,16 +63,9 @@ #include <openssl/conf.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static ASN1_IA5STRING *ia5string_new(void); static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5); static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); -#else -static ASN1_IA5STRING *ia5string_new(); -static char *i2s_ASN1_IA5STRING(); -static ASN1_IA5STRING *s2i_ASN1_IA5STRING(); -#endif - X509V3_EXT_METHOD v3_ns_ia5_list[] = { EXT_IA5STRING(NID_netscape_base_url), EXT_IA5STRING(NID_netscape_revocation_url), diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c index 2637ff10ac..0ee8c3c5f6 100644 --- a/crypto/x509v3/v3_pku.c +++ b/crypto/x509v3/v3_pku.c @@ -62,18 +62,10 @@ #include <openssl/asn1_mac.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *usage, BIO *out, int indent); /* static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *values); */ -#else - -static int i2r_PKEY_USAGE_PERIOD(); -static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(); - -#endif - X509V3_EXT_METHOD v3_pkey_usage_period = { NID_private_key_usage_period, 0, (X509V3_EXT_NEW)PKEY_USAGE_PERIOD_new, @@ -85,12 +77,6 @@ NULL, NULL, NULL, NULL, NULL }; - -/* - * ASN1err(ASN1_F_PKEY_USAGE_PERIOD_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_PKEY_USAGE_PERIOD,ERR_R_MALLOC_FAILURE); - */ - int i2d_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c index b83aef6938..cca2eb9aef 100644 --- a/crypto/x509v3/v3_skey.c +++ b/crypto/x509v3/v3_skey.c @@ -61,14 +61,8 @@ #include "cryptlib.h" #include <openssl/x509v3.h> -#ifndef NOPROTO static ASN1_OCTET_STRING *octet_string_new(void); static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); -#else -static ASN1_OCTET_STRING *s2i_skey_id(); -static ASN1_OCTET_STRING *octet_string_new(); -#endif - X509V3_EXT_METHOD v3_skey_id = { NID_subject_key_identifier, 0, (X509V3_EXT_NEW)octet_string_new, ASN1_STRING_free, diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c index cd193d8d89..a35e801450 100644 --- a/crypto/x509v3/v3_sxnet.c +++ b/crypto/x509v3/v3_sxnet.c @@ -67,15 +67,10 @@ #define SXNET_TEST -#ifndef NOPROTO static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent); #ifdef SXNET_TEST static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); #endif -#else -static int sxnet_i2r(); -#endif - X509V3_EXT_METHOD v3_sxnet = { NID_sxnet, X509V3_EXT_MULTILINE, (X509V3_EXT_NEW)SXNET_new, @@ -95,13 +90,6 @@ NULL }; -/* - * ASN1err(ASN1_F_SXNET_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_SXNET,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_SXNETID_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_SXNETID,ERR_R_MALLOC_FAILURE); - */ - int i2d_SXNET(SXNET *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 2a5bf08e81..80bb36e78e 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -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); @@ -420,145 +419,6 @@ 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); -#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(); - -int i2d_CRL_DIST_POINTS(); -STACK_OF(DIST_POINT) *CRL_DIST_POINTS_new(); -void CRL_DIST_POINTS_free(); -STACK_OF(DIST_POINT) *d2i_CRL_DIST_POINTS(); - -int i2d_DIST_POINT(); -DIST_POINT *DIST_POINT_new(); -DIST_POINT *d2i_DIST_POINT(); -void DIST_POINT_free(); - -int i2d_DIST_POINT_NAME(); -DIST_POINT_NAME *DIST_POINT_NAME_new(); -void DIST_POINT_NAME_free(); -DIST_POINT_NAME *d2i_DIST_POINT_NAME(); - -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_uchar(); -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. |