diff options
Diffstat (limited to 'crypto/asn1')
63 files changed, 1 insertions, 471 deletions
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index d1d28bd9bb..38ea802be8 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -60,10 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_ASN1_STRING_NEW,ASN1_R_STRING_TOO_SHORT); - * ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,ASN1_R_EXPECTING_A_BIT_STRING); - */ - int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp) { int ret,j,r,bits,len; diff --git a/crypto/asn1/a_bmp.c b/crypto/asn1/a_bmp.c index e492ab9ec0..6075871984 100644 --- a/crypto/asn1/a_bmp.c +++ b/crypto/asn1/a_bmp.c @@ -60,9 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_EXPECTING_AN_INTEGER); - */ - int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c index 711c57e5c0..18fa61840b 100644 --- a/crypto/asn1/a_bool.c +++ b/crypto/asn1/a_bool.c @@ -60,10 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_EXPECTING_A_BOOLEAN); - * ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_BOOLEAN_IS_WRONG_LENGTH); - */ - int i2d_ASN1_BOOLEAN(int a, unsigned char **pp) { int r; diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c index 153be36660..de74e8a629 100644 --- a/crypto/asn1/a_bytes.c +++ b/crypto/asn1/a_bytes.c @@ -60,10 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,ASN1_R_WRONG_TYPE); - * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); - */ - static unsigned long tag2bit[32]={ 0, 0, 0, B_ASN1_BIT_STRING, /* tags 0 - 3 */ B_ASN1_OCTET_STRING, 0, 0, B_ASN1_UNKNOWN,/* tags 4- 7 */ @@ -75,12 +71,7 @@ B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,0, B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN, }; -#ifndef NOPROTO static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c); -#else -static int asn1_collate_primative(); -#endif - /* type is a 'bitmap' of acceptable string types. */ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp, diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index 7ad863a4bc..365403954e 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -62,9 +62,6 @@ /* Support for ASN1 ENUMERATED type: based on a_int.c */ -/* ASN1err(ASN1_F_D2I_ASN1_ENUMERATED,ASN1_R_EXPECTING_AN_ENUMERATED); - */ - int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a, unsigned char **pp) { int pad=0,ret,r,i,t; diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index 3952eaf170..c5d378fb1a 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -63,10 +63,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_NEW,ASN1_R_GENERALIZEDTIME_TOO_LONG); - * ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME,ASN1_R_EXPECTING_A_GENERALIZEDTIME); - */ - int i2d_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/a_hdr.c b/crypto/asn1/a_hdr.c index 1d44b9d5a1..1171d36443 100644 --- a/crypto/asn1/a_hdr.c +++ b/crypto/asn1/a_hdr.c @@ -61,13 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/asn1.h> -/* - * ASN1err(ASN1_F_D2I_ASN1_HEADER,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_ASN1_HEADER,ERR_R_BAD_GET_ASN1_OBJECT_CALL); - * ASN1err(ASN1_F_I2D_ASN1_HEADER,ERR_R_BAD_GET_ASN1_OBJECT_CALL); - * ASN1err(ASN1_F_ASN1_HEADER_NEW,ERR_R_BAD_GET_ASN1_OBJECT_CALL); - */ - int i2d_ASN1_HEADER(ASN1_HEADER *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index dcae5cce35..6e8c7e57be 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -60,9 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER); - */ - int i2d_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp) { int pad=0,ret,r,i,t; diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 9f9b2f04f2..578df13f29 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -62,11 +62,6 @@ #include <openssl/asn1.h> #include <openssl/objects.h> -/* ASN1err(ASN1_F_ASN1_OBJECT_NEW,ASN1_R_EXPECTING_AN_OBJECT); - * ASN1err(ASN1_F_D2I_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER); - * ASN1err(ASN1_F_I2T_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER); - */ - int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp) { unsigned char *p; diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c index 16cf8133af..7659a13bd3 100644 --- a/crypto/asn1/a_octet.c +++ b/crypto/asn1/a_octet.c @@ -60,9 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ASN1_R_EXPECTING_AN_OCTET_STRING); - */ - int i2d_ASN1_OCTET_STRING(ASN1_OCTET_STRING *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index 4e50f6ec8b..3d7629089c 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -60,10 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_WRONG_PRINTABLE_TYPE); - * ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_TAG_VALUE_TOO_HIGH); - */ - int i2d_ASN1_IA5STRING(ASN1_IA5STRING *a, unsigned char **pp) { return(M_i2d_ASN1_IA5STRING(a,pp)); } diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c index 17c0a5f841..c2481e7597 100644 --- a/crypto/asn1/a_set.c +++ b/crypto/asn1/a_set.c @@ -60,8 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* ASN1err(ASN1_F_ASN1_TYPE_NEW,ERR_R_MALLOC_FAILURE); - */ typedef struct { unsigned char *pbData; diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index c9b5e7d047..c1ca8b20ff 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -60,16 +60,7 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* ASN1err(ASN1_F_D2I_ASN1_BYTES,ASN1_R_WRONG_TAG); - * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); - */ - -#ifndef NOPROTO static void ASN1_TYPE_component_free(ASN1_TYPE *a); -#else -static void ASN1_TYPE_component_free(); -#endif - int i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp) { int r=0; diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 5c5d8a1cab..0fa8ae2ba7 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -61,10 +61,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_ASN1_UTCTIME_NEW,ASN1_R_UTCTIME_TOO_LONG); - * ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_EXPECTING_A_UTCTIME); - */ - int i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c index 70078b68f9..4a8a92e9e4 100644 --- a/crypto/asn1/a_utf8.c +++ b/crypto/asn1/a_utf8.c @@ -60,9 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_UTF8STRING,ERR_R_MALLOC_FAILURE); - */ - int i2d_ASN1_UTF8STRING(ASN1_UTF8STRING *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/a_vis.c b/crypto/asn1/a_vis.c index b47e4b3042..2072be780d 100644 --- a/crypto/asn1/a_vis.c +++ b/crypto/asn1/a_vis.c @@ -60,9 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1err(ASN1_F_D2I_ASN1_VISIBLESTRING,ERR_R_MALLOC_FAILURE); - */ - int i2d_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING *a, unsigned char **pp) { return(i2d_ASN1_bytes((ASN1_STRING *)a,pp, diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 8a28085d55..7ce7eb3fe2 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -452,7 +452,6 @@ typedef struct asn1_header_st #define IS_SEQUENCE 0 #define IS_SET 1 -#ifndef NOPROTO ASN1_TYPE * ASN1_TYPE_new(void ); void ASN1_TYPE_free(ASN1_TYPE *a); int i2d_ASN1_TYPE(ASN1_TYPE *a,unsigned char **pp); @@ -678,137 +677,6 @@ unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf, char *ASN1_unpack_string(ASN1_STRING *oct, char *(*d2i)()); ASN1_STRING *ASN1_pack_string(char *obj, int (*i2d)(), ASN1_OCTET_STRING **oct); -#else -#error "OpenSSL cannot be used with NOPROTO defined. The NOPROTO sections in header files exist only for automatic parsing by certain utilities." -/* Without this, highly uncomprehensible error messages can occur - * when compiling something with -DNOPROTO ... */ - -ASN1_TYPE * ASN1_TYPE_new(); -void ASN1_TYPE_free(); -int i2d_ASN1_TYPE(); -ASN1_TYPE * d2i_ASN1_TYPE(); -int ASN1_TYPE_get(); -void ASN1_TYPE_set(); - -ASN1_OBJECT * ASN1_OBJECT_new(); -void ASN1_OBJECT_free(); -int i2d_ASN1_OBJECT(); -ASN1_OBJECT * d2i_ASN1_OBJECT(); -ASN1_STRING * ASN1_STRING_new(); -void ASN1_STRING_free(); -ASN1_STRING * ASN1_STRING_dup(); -ASN1_STRING * ASN1_STRING_type_new(); -int ASN1_STRING_cmp(); -int ASN1_STRING_set(); -int i2d_ASN1_BIT_STRING(); -ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(); -int ASN1_BIT_STRING_set_bit(); -int ASN1_BIT_STRING_get_bit(); -int i2d_ASN1_BOOLEAN(); -int d2i_ASN1_BOOLEAN(); -int i2d_ASN1_INTEGER(); -ASN1_INTEGER *d2i_ASN1_INTEGER(); -int i2d_ASN1_ENUMERATED(); -ASN1_INTEGER *d2i_ASN1_ENUMERATED(); -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_VISIBLESTRING(); -ASN1_VISIBLESTRING *d2i_ASN1_VISIBLESTRING(); -int i2d_ASN1_UTF8STRING(); -ASN1_UTF8STRING *d2i_ASN1_UTF8STRING(); -int i2d_ASN1_PRINTABLE(); -ASN1_STRING *d2i_ASN1_PRINTABLE(); -int i2d_DIRECTORYSTRING(); -ASN1_STRING *d2i_DIRECTORYSTRING(); -int i2d_DISPLAYTEXT(); -ASN1_STRING *d2i_DISPLAYTEXT(); -ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING(); -ASN1_T61STRING *d2i_ASN1_T61STRING(); -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(); -ASN1_TIME *ASN1_TIME_set(); -int i2d_ASN1_SET(); -STACK * d2i_ASN1_SET(); -int a2d_ASN1_OBJECT(); -ASN1_OBJECT *ASN1_OBJECT_create(); -int ASN1_INTEGER_set(); -long ASN1_INTEGER_get(); -ASN1_INTEGER *BN_to_ASN1_INTEGER(); -BIGNUM *ASN1_INTEGER_to_BN(); -int ASN1_ENUMERATED_set(); -long ASN1_ENUMERATED_get(); -ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(); -BIGNUM *ASN1_ENUMERATED_to_BN(); -int ASN1_PRINTABLE_type(); -int i2d_ASN1_bytes(); -ASN1_STRING *d2i_ASN1_bytes(); -ASN1_STRING *d2i_ASN1_type_bytes(); -int asn1_Finish(); -int ASN1_get_object(); -int ASN1_check_infinite_end(); -void ASN1_put_object(); -int ASN1_object_size(); -char *ASN1_dup(); -#ifndef NO_FP_API -char *ASN1_d2i_fp(); -int ASN1_i2d_fp(); -#endif - -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(); -int a2i_ASN1_INTEGER(); -int i2a_ASN1_ENUMERATED(); -int a2i_ASN1_ENUMERATED(); -int i2a_ASN1_OBJECT(); -int i2t_ASN1_OBJECT(); -int a2i_ASN1_STRING(); -int i2a_ASN1_STRING(); - -int i2d_ASN1_HEADER(); -ASN1_HEADER *d2i_ASN1_HEADER(); -ASN1_HEADER *ASN1_HEADER_new(); -void ASN1_HEADER_free(); -void ERR_load_ASN1_strings(); -ASN1_METHOD *X509_asn1_meth(); -ASN1_METHOD *RSAPrivateKey_asn1_meth(); -ASN1_METHOD *ASN1_IA5STRING_asn1_meth(); -ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(); - -int ASN1_UNIVERSALSTRING_to_string(); - -int ASN1_TYPE_set_octetstring(); -int ASN1_TYPE_get_octetstring(); -int ASN1_TYPE_set_int_octetstring(); -int ASN1_TYPE_get_int_octetstring(); - -int i2d_ASN1_BMPSTRING(); -ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(); - -STACK *ASN1_seq_unpack(); -unsigned char *ASN1_seq_pack(); -char *ASN1_unpack_string(); -ASN1_STRING *ASN1_pack_string(); - -#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. diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 628b864015..7fd9f53b0e 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -61,14 +61,8 @@ #include <openssl/asn1.h> #include <openssl/asn1_mac.h> -#ifndef NOPROTO static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max); static void asn1_put_length(unsigned char **pp, int length); -#else -static int asn1_get_length(); -static void asn1_put_length(); -#endif - const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT; int ASN1_check_infinite_end(unsigned char **p, long len) diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h index 4d1731de7c..0497805590 100644 --- a/crypto/asn1/asn1_mac.h +++ b/crypto/asn1/asn1_mac.h @@ -447,14 +447,8 @@ err:\ #define M_ASN1_I2D_finish() *pp=p; \ return(r); -#ifndef NOPROTO int asn1_GetSequence(ASN1_CTX *c, long *length); void asn1_add_error(unsigned char *address,int offset); -#else -int asn1_GetSequence(); -void asn1_add_error(); -#endif - #ifdef __cplusplus } #endif diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index fd36b4c13d..e72f688140 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -62,16 +62,10 @@ #include <openssl/objects.h> #include <openssl/x509.h> -#ifndef NOPROTO static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed, int indent); static int asn1_parse2(BIO *bp, unsigned char **pp, long length, int offset, int depth, int indent); -#else -static int asn1_print_info(); -static int asn1_parse2(); -#endif - static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed, int indent) { diff --git a/crypto/asn1/d2i_dhp.c b/crypto/asn1/d2i_dhp.c index f76a9d4423..a0f514dc7e 100644 --- a/crypto/asn1/d2i_dhp.c +++ b/crypto/asn1/d2i_dhp.c @@ -63,11 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_DHPARAMS,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - DH *d2i_DHparams(DH **a, unsigned char **pp, long length) { int i=ERR_R_NESTED_ASN1_ERROR; diff --git a/crypto/asn1/d2i_dsap.c b/crypto/asn1/d2i_dsap.c index df48eda2f4..2582b8fd45 100644 --- a/crypto/asn1/d2i_dsap.c +++ b/crypto/asn1/d2i_dsap.c @@ -63,11 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_DSAPARAMS,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - DSA *d2i_DSAparams(DSA **a, unsigned char **pp, long length) { int i=ERR_R_NESTED_ASN1_ERROR; diff --git a/crypto/asn1/d2i_r_pr.c b/crypto/asn1/d2i_r_pr.c index 8e46efce8a..f6d118937c 100644 --- a/crypto/asn1/d2i_r_pr.c +++ b/crypto/asn1/d2i_r_pr.c @@ -63,12 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_PARSING); - */ - static ASN1_METHOD method={ (int (*)()) i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey, diff --git a/crypto/asn1/d2i_r_pu.c b/crypto/asn1/d2i_r_pu.c index 6ccec8c9b6..80deaab71a 100644 --- a/crypto/asn1/d2i_r_pu.c +++ b/crypto/asn1/d2i_r_pu.c @@ -63,11 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - RSA *d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length) { int i=ASN1_R_PARSING; diff --git a/crypto/asn1/d2i_s_pr.c b/crypto/asn1/d2i_s_pr.c index 35fb3334e0..cf64a2edad 100644 --- a/crypto/asn1/d2i_s_pr.c +++ b/crypto/asn1/d2i_s_pr.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ +/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ #include <stdio.h> #include "cryptlib.h" @@ -65,12 +65,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_PARSING); - */ - DSA *d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length) { int i=ASN1_R_PARSING; diff --git a/crypto/asn1/d2i_s_pu.c b/crypto/asn1/d2i_s_pu.c index 562acd6922..4d65cef5a9 100644 --- a/crypto/asn1/d2i_s_pu.c +++ b/crypto/asn1/d2i_s_pu.c @@ -65,11 +65,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_DSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - DSA *d2i_DSAPublicKey(DSA **a, unsigned char **pp, long length) { int i=ASN1_R_PARSING; diff --git a/crypto/asn1/i2d_dhp.c b/crypto/asn1/i2d_dhp.c index c3763eb6a5..e82f2a96af 100644 --- a/crypto/asn1/i2d_dhp.c +++ b/crypto/asn1/i2d_dhp.c @@ -62,11 +62,6 @@ #include <openssl/asn1_mac.h> #include <openssl/dh.h> -/* - * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_DHPARAMS_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_DHparams(DH *a, unsigned char **pp) { BIGNUM *num[3]; diff --git a/crypto/asn1/i2d_dsap.c b/crypto/asn1/i2d_dsap.c index a7d03fe6d6..9317110464 100644 --- a/crypto/asn1/i2d_dsap.c +++ b/crypto/asn1/i2d_dsap.c @@ -62,10 +62,6 @@ #include <openssl/asn1_mac.h> #include <openssl/dsa.h> -/* - * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_DSAparams(DSA *a, unsigned char **pp) { BIGNUM *num[3]; diff --git a/crypto/asn1/i2d_r_pr.c b/crypto/asn1/i2d_r_pr.c index cc61637de4..617c10af46 100644 --- a/crypto/asn1/i2d_r_pr.c +++ b/crypto/asn1/i2d_r_pr.c @@ -63,11 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - int i2d_RSAPrivateKey(RSA *a, unsigned char **pp) { BIGNUM *num[9]; diff --git a/crypto/asn1/i2d_r_pu.c b/crypto/asn1/i2d_r_pu.c index eabc0ba892..03f7348527 100644 --- a/crypto/asn1/i2d_r_pu.c +++ b/crypto/asn1/i2d_r_pu.c @@ -63,11 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - int i2d_RSAPublicKey(RSA *a, unsigned char **pp) { BIGNUM *num[2]; diff --git a/crypto/asn1/i2d_s_pr.c b/crypto/asn1/i2d_s_pr.c index afd8f5af03..f3a5e8fe9d 100644 --- a/crypto/asn1/i2d_s_pr.c +++ b/crypto/asn1/i2d_s_pr.c @@ -63,10 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - int i2d_DSAPrivateKey(DSA *a, unsigned char **pp) { BIGNUM *num[6]; diff --git a/crypto/asn1/i2d_s_pu.c b/crypto/asn1/i2d_s_pu.c index 5c2757255d..7903ea410d 100644 --- a/crypto/asn1/i2d_s_pu.c +++ b/crypto/asn1/i2d_s_pu.c @@ -63,10 +63,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - int i2d_DSAPublicKey(DSA *a, unsigned char **pp) { BIGNUM *num[4]; diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index f03ecca2ee..9133bc6d29 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -74,24 +74,10 @@ typedef struct netscape_pkey_st ASN1_OCTET_STRING *private_key; } NETSCAPE_PKEY; -/* - * ASN1err(ASN1_F_D2I_NETSCAPE_RSA,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_NETSCAPE_RSA,ASN1_R_DECODING_ERROR); - * ASN1err(ASN1_F_D2I_NETSCAPE_PKEY,ASN1_R_DECODING_ERROR); - * ASN1err(ASN1_F_NETSCAPE_PKEY_NEW,ASN1_R_DECODING_ERROR); - */ -#ifndef NOPROTO static int i2d_NETSCAPE_PKEY(NETSCAPE_PKEY *a, unsigned char **pp); static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a,unsigned char **pp, long length); static NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *); -#else -static int i2d_NETSCAPE_PKEY(); -static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(); -static NETSCAPE_PKEY *NETSCAPE_PKEY_new(); -static void NETSCAPE_PKEY_free(); -#endif - int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)()) { int i,j,l[6]; diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c index 34b16c4c46..bb447d76e8 100644 --- a/crypto/asn1/nsseq.c +++ b/crypto/asn1/nsseq.c @@ -65,11 +65,6 @@ /* Netscape certificate sequence structure */ -/* - * ASN1err(ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE,ERR_R_MALLOC_FAILURE); - */ - int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp) { int v = 0; diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c index 950d5650c1..c7a3ecf9fb 100644 --- a/crypto/asn1/p5_pbe.c +++ b/crypto/asn1/p5_pbe.c @@ -65,11 +65,6 @@ #define PKCS5_SALT_LEN 8 -/* - *ASN1err(ASN1_F_PBEPARAM_NEW,ASN1_R_DECODE_ERROR) - *ASN1err(ASN1_F_D2I_PBEPARAM,ASN1_R_DECODE_ERROR) - */ - int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 327be53a74..ee1ed87d9a 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -63,13 +63,6 @@ /* PKCS#5 v2.0 password based encryption structures */ -/* - *ASN1err(ASN1_F_PBE2PARAM_NEW,ASN1_R_DECODE_ERROR) - *ASN1err(ASN1_F_D2I_PBE2PARAM,ASN1_R_DECODE_ERROR) - *ASN1err(ASN1_F_PBKDF2PARAM_NEW,ASN1_R_DECODE_ERROR) - *ASN1err(ASN1_F_D2I_PBKDF2PARAM,ASN1_R_DECODE_ERROR) - */ - int i2d_PBE2PARAM(PBE2PARAM *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_dgst.c b/crypto/asn1/p7_dgst.c index bdec3e5146..62783a2b8d 100644 --- a/crypto/asn1/p7_dgst.c +++ b/crypto/asn1/p7_dgst.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_DIGEST_NEW,ERR_R_MISSING_ASN1_EOS); - * ASN1err(ASN1_F_D2I_PKCS7_DIGEST,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_DIGEST(PKCS7_DIGEST *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_enc.c b/crypto/asn1/p7_enc.c index 40357c4550..4741126587 100644 --- a/crypto/asn1/p7_enc.c +++ b/crypto/asn1/p7_enc.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_ENCRYPT_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_ENCRYPT,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_enc_c.c b/crypto/asn1/p7_enc_c.c index ce8f9c1559..a832737a38 100644 --- a/crypto/asn1/p7_enc_c.c +++ b/crypto/asn1/p7_enc_c.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_ENC_CONTENT_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_ENC_CONTENT,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_evp.c b/crypto/asn1/p7_evp.c index 4989b93638..701578e6fb 100644 --- a/crypto/asn1/p7_evp.c +++ b/crypto/asn1/p7_evp.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_ENVELOPE_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_ENVELOPE,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_i_s.c b/crypto/asn1/p7_i_s.c index f0ba5bc98c..7d4b457e01 100644 --- a/crypto/asn1/p7_i_s.c +++ b/crypto/asn1/p7_i_s.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_ISSUER_AND_SERIAL(PKCS7_ISSUER_AND_SERIAL *a, unsigned char **pp) { diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c index 52cfb93c72..7b9477cb32 100644 --- a/crypto/asn1/p7_lib.c +++ b/crypto/asn1/p7_lib.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/objects.h> -/* ASN1err(ASN1_F_D2I_PKCS7,ASN1_R_BAD_PKCS7_CONTENT); - * ASN1err(ASN1_F_I2D_PKCS7,ASN1_R_BAD_PKCS7_TYPE); - * ASN1err(ASN1_F_PKCS7_NEW,ASN1_R_BAD_PKCS7_TYPE); - */ - int i2d_PKCS7(PKCS7 *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_recip.c b/crypto/asn1/p7_recip.c index d6e2876c85..d6017af30b 100644 --- a/crypto/asn1/p7_recip.c +++ b/crypto/asn1/p7_recip.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_RECIP_INFO,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_s_e.c b/crypto/asn1/p7_s_e.c index 54098d2341..0a3eeeb65b 100644 --- a/crypto/asn1/p7_s_e.c +++ b/crypto/asn1/p7_s_e.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c index 90d3dcdd79..186e6ed0e1 100644 --- a/crypto/asn1/p7_signd.c +++ b/crypto/asn1/p7_signd.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_SIGNED_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_SIGNED,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_SIGNED(PKCS7_SIGNED *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p7_signi.c b/crypto/asn1/p7_signi.c index 5a240bc593..056c5d3065 100644 --- a/crypto/asn1/p7_signi.c +++ b/crypto/asn1/p7_signi.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_PKCS7_SIGNER_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_SIGNER_INFO,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index 4a215abf8a..17c5bc3ccb 100644 --- a/crypto/asn1/p8_pkey.c +++ b/crypto/asn1/p8_pkey.c @@ -60,11 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* - *ASN1err(ASN1_F_PKCS8_PRIV_KEY_INFO_NEW,ASN1_R_DECODE_ERROR) - *ASN1err(ASN1_F_D2I_PKCS8_PRIV_KEY_INFO,ASN1_R_DECODE_ERROR) - */ - int i2d_PKCS8_PRIV_KEY_INFO (PKCS8_PRIV_KEY_INFO *a, unsigned char **pp) { diff --git a/crypto/asn1/pkcs8.c b/crypto/asn1/pkcs8.c index d71f8c2d88..29c4ea6a29 100644 --- a/crypto/asn1/pkcs8.c +++ b/crypto/asn1/pkcs8.c @@ -61,11 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/objects.h> -/* - * ASN1err(ASN1_F_D2I_X509_KEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_KEY_NEW,ERR_R_BAD_GET_ASN1_OBJECT_CALL); - */ - int i2d_X509_KEY(X509 *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/t_crl.c b/crypto/asn1/t_crl.c index bdfa03aa1a..4470f0652f 100644 --- a/crypto/asn1/t_crl.c +++ b/crypto/asn1/t_crl.c @@ -64,12 +64,7 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -#ifndef NOPROTO static void ext_print(BIO *out, X509_EXTENSION *ex); -#else -static void ext_print(); -#endif - #ifndef NO_FP_API int X509_CRL_print_fp(FILE *fp, X509_CRL *x) { diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index 7bf470e8dd..0dc6e30c3d 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -70,17 +70,8 @@ #include <openssl/dsa.h> #endif -/* DHerr(DH_F_DHPARAMS_PRINT,ERR_R_MALLOC_FAILURE); - * DSAerr(DSA_F_DSAPARAMS_PRINT,ERR_R_MALLOC_FAILURE); - */ - -#ifndef NOPROTO static int print(BIO *fp,const char *str,BIGNUM *num, unsigned char *buf,int off); -#else -static int print(); -#endif - #ifndef NO_RSA #ifndef NO_FP_API int RSA_print_fp(FILE *fp, RSA *x, int off) diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c index 2d94b047fe..fd6f3ee40d 100644 --- a/crypto/asn1/x_algor.c +++ b/crypto/asn1/x_algor.c @@ -60,12 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_ALGOR,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_ALGOR_NEW,ERR_R_EXPECTING_AN_ASN1_SEQUENCE); - * ASN1err(ASN1_F_D2I_X509_ALGOR,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c index 6b33f58f57..78a7990c2f 100644 --- a/crypto/asn1/x_attrib.c +++ b/crypto/asn1/x_attrib.c @@ -61,12 +61,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_ATTRIBUTE,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_ATTRIBUTE_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - * ASN1err(ASN1_F_I2D_X509_ATTRIBUTE,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - /* sequence */ int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp) { diff --git a/crypto/asn1/x_cinf.c b/crypto/asn1/x_cinf.c index 5ef17a932c..fb6122eea4 100644 --- a/crypto/asn1/x_cinf.c +++ b/crypto/asn1/x_cinf.c @@ -60,11 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_CINF,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_CINF_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_CINF(X509_CINF *a, unsigned char **pp) { int v1=0,v2=0; diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index 82a2737a8d..969134918b 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -61,23 +61,8 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_D2I_X509_CRL,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_X509_CRL_INFO,ERR_R_EXPECTING_AN_ASN1_SEQUENCE); - * ASN1err(ASN1_F_D2I_X509_REVOKED,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_CRL_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_CRL_INFO_NEW,ERR_R_EXPECTING_AN_ASN1_SEQUENCE); - * ASN1err(ASN1_F_X509_REVOKED_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - -#ifndef NOPROTO static int X509_REVOKED_cmp(X509_REVOKED **a,X509_REVOKED **b); static int X509_REVOKED_seq_cmp(X509_REVOKED **a,X509_REVOKED **b); -#else -static int X509_REVOKED_cmp(); -static int X509_REVOKED_seq_cmp(); -#endif - int i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c index f6124bbb8e..9573b11c9e 100644 --- a/crypto/asn1/x_exten.c +++ b/crypto/asn1/x_exten.c @@ -61,11 +61,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_EXTENSION,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_EXTENSION_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_EXTENSION(X509_EXTENSION *a, unsigned char **pp) { int k=0; diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c index 15d9aa4ea0..c26c1ce01a 100644 --- a/crypto/asn1/x_name.c +++ b/crypto/asn1/x_name.c @@ -61,19 +61,7 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_NAME,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_NAME_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - * ASN1err(ASN1_F_D2I_X509_NAME_ENTRY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_NAME_ENTRY_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); - */ - -#ifndef NOPROTO static int i2d_X509_NAME_entries(X509_NAME *a); -#else -static int i2d_X509_NAME_entries(); -#endif - int i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c index fc145a8ce8..30d8c1df08 100644 --- a/crypto/asn1/x_pkey.c +++ b/crypto/asn1/x_pkey.c @@ -62,9 +62,6 @@ #include <openssl/objects.h> #include <openssl/asn1_mac.h> -/* ASN1err(ASN1_F_D2I_X509_PKEY,ASN1_R_UNSUPPORTED_CIPHER); */ -/* ASN1err(ASN1_F_X509_PKEY_NEW,ASN1_R_IV_TOO_LARGE); */ - /* need to implement */ int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 90b6c908a2..7e3bd0581c 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -60,11 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_PUBKEY,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_PUBKEY_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_PUBKEY(X509_PUBKEY *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index f6b1a95b7a..0f14e307e1 100644 --- a/crypto/asn1/x_req.c +++ b/crypto/asn1/x_req.c @@ -61,13 +61,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* - * ASN1err(ASN1_F_D2I_X509_REQ,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_X509_REQ_INFO,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_REQ_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_REQ_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c index f9c2a57c00..b7cd078ddb 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -60,11 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509_SIG,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_SIG_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_X509_SIG(X509_SIG *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c index 22991245a8..43e0023839 100644 --- a/crypto/asn1/x_spki.c +++ b/crypto/asn1/x_spki.c @@ -65,13 +65,6 @@ #include <openssl/x509.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_NETSCAPE_SPKAC,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_NETSCAPE_SPKAC_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_NETSCAPE_SPKI,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_NETSCAPE_SPKI_NEW,ERR_R_ASN1_LENGTH_MISMATCH); - */ - int i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c index b82f913b5c..296e68f3eb 100644 --- a/crypto/asn1/x_val.c +++ b/crypto/asn1/x_val.c @@ -60,11 +60,6 @@ #include "cryptlib.h" #include <openssl/asn1_mac.h> -/* ASN1err(ASN1_F_X509_VAL_NEW,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_X509_VAL_FREE,ERR_R_MALLOC_FAILURE); - * ASN1err(ASN1_F_D2I_X509_VAL,ERR_R_MALLOC_FAILURE); - */ - int i2d_X509_VAL(X509_VAL *a, unsigned char **pp) { M_ASN1_I2D_vars(a); diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index d6938f7da0..4962a1066f 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -61,11 +61,6 @@ #include <openssl/evp.h> #include <openssl/asn1_mac.h> -/* - * ASN1err(ASN1_F_D2I_X509,ERR_R_ASN1_LENGTH_MISMATCH); - * ASN1err(ASN1_F_X509_NEW,ERR_R_BAD_GET_ASN1_OBJECT_CALL); - */ - static ASN1_METHOD meth={ (int (*)()) i2d_X509, (char *(*)())d2i_X509, |