From a9be3af5ad4836f7e50f0546311ca90c717b861e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulf=20M=C3=B6ller?= Date: Mon, 26 Apr 1999 16:43:10 +0000 Subject: Remove NOPROTO definitions and error code comments. --- CHANGES | 3 + apps/apps.c | 5 - apps/apps.h | 9 -- apps/ca.c | 22 ---- apps/crl.c | 5 - apps/crl2p7.c | 5 - apps/dgst.c | 5 - apps/dsaparam.c | 5 - apps/enc.c | 5 - apps/gendh.c | 6 - apps/gendsa.c | 5 - apps/genrsa.c | 6 - apps/nseq.c | 4 - apps/openssl.c | 8 -- apps/pkcs12.c | 12 -- apps/progs.h | 30 ----- apps/progs.pl | 7 - apps/req.c | 11 -- apps/s_apps.h | 23 ---- apps/s_client.c | 6 - apps/s_server.c | 16 --- apps/s_socket.c | 6 - apps/s_time.c | 8 -- apps/sc.c | 6 - apps/sess_id.c | 5 - apps/speed.c | 12 -- apps/testdsa.h | 7 - apps/verify.c | 6 - apps/x509.c | 9 -- crypto/asn1/a_bitstr.c | 4 - crypto/asn1/a_bmp.c | 3 - crypto/asn1/a_bool.c | 4 - crypto/asn1/a_bytes.c | 9 -- crypto/asn1/a_enum.c | 3 - crypto/asn1/a_gentm.c | 4 - crypto/asn1/a_hdr.c | 7 - crypto/asn1/a_int.c | 3 - crypto/asn1/a_object.c | 5 - crypto/asn1/a_octet.c | 3 - crypto/asn1/a_print.c | 4 - crypto/asn1/a_set.c | 2 - crypto/asn1/a_type.c | 9 -- crypto/asn1/a_utctm.c | 4 - crypto/asn1/a_utf8.c | 3 - crypto/asn1/a_vis.c | 3 - crypto/asn1/asn1.h | 132 ------------------- crypto/asn1/asn1_lib.c | 6 - crypto/asn1/asn1_mac.h | 6 - crypto/asn1/asn1_par.c | 6 - crypto/asn1/d2i_dhp.c | 5 - crypto/asn1/d2i_dsap.c | 5 - crypto/asn1/d2i_r_pr.c | 6 - crypto/asn1/d2i_r_pu.c | 5 - crypto/asn1/d2i_s_pr.c | 8 +- crypto/asn1/d2i_s_pu.c | 5 - crypto/asn1/i2d_dhp.c | 5 - crypto/asn1/i2d_dsap.c | 4 - crypto/asn1/i2d_r_pr.c | 5 - crypto/asn1/i2d_r_pu.c | 5 - crypto/asn1/i2d_s_pr.c | 4 - crypto/asn1/i2d_s_pu.c | 4 - crypto/asn1/n_pkey.c | 14 -- crypto/asn1/nsseq.c | 5 - crypto/asn1/p5_pbe.c | 5 - crypto/asn1/p5_pbev2.c | 7 - crypto/asn1/p7_dgst.c | 5 - crypto/asn1/p7_enc.c | 5 - crypto/asn1/p7_enc_c.c | 5 - crypto/asn1/p7_evp.c | 5 - crypto/asn1/p7_i_s.c | 5 - crypto/asn1/p7_lib.c | 5 - crypto/asn1/p7_recip.c | 5 - crypto/asn1/p7_s_e.c | 5 - crypto/asn1/p7_signd.c | 5 - crypto/asn1/p7_signi.c | 5 - crypto/asn1/p8_pkey.c | 5 - crypto/asn1/pkcs8.c | 5 - crypto/asn1/t_crl.c | 5 - crypto/asn1/t_pkey.c | 9 -- crypto/asn1/x_algor.c | 6 - crypto/asn1/x_attrib.c | 6 - crypto/asn1/x_cinf.c | 5 - crypto/asn1/x_crl.c | 15 --- crypto/asn1/x_exten.c | 5 - crypto/asn1/x_name.c | 12 -- crypto/asn1/x_pkey.c | 3 - crypto/asn1/x_pubkey.c | 5 - crypto/asn1/x_req.c | 7 - crypto/asn1/x_sig.c | 5 - crypto/asn1/x_spki.c | 7 - crypto/asn1/x_val.c | 5 - crypto/asn1/x_x509.c | 5 - crypto/bf/bf_opts.c | 10 -- crypto/bf/bfspeed.c | 10 -- crypto/bf/bftest.c | 6 - crypto/bf/blowfish.h | 14 -- crypto/bio/b_sock.c | 9 -- crypto/bio/bf_buff.c | 11 -- crypto/bio/bf_nbio.c | 11 -- crypto/bio/bf_null.c | 11 -- crypto/bio/bio.h | 129 ------------------- crypto/bio/bss_acpt.c | 21 --- crypto/bio/bss_conn.c | 22 ---- crypto/bio/bss_file.c | 11 -- crypto/bio/bss_log.c | 9 -- crypto/bio/bss_mem.c | 11 -- crypto/bio/bss_null.c | 11 -- crypto/bio/bss_sock.c | 21 --- crypto/bn/bn.h | 117 ----------------- crypto/bn/bn_gcd.c | 5 - crypto/bn/bn_lcl.h | 10 -- crypto/bn/bn_prime.c | 8 -- crypto/bn/bnspeed.c | 5 - crypto/bn/bntest.c | 19 --- crypto/bn/expspeed.c | 5 - crypto/buffer/buffer.h | 12 -- crypto/cast/cast.h | 13 -- crypto/cast/cast_spd.c | 10 -- crypto/cast/castopts.c | 10 -- crypto/comp/comp.h | 13 -- crypto/conf/conf.c | 15 --- crypto/conf/conf.h | 12 -- crypto/cryptlib.c | 7 - crypto/crypto.h | 50 -------- crypto/des/des.c | 15 --- crypto/des/des.h | 61 --------- crypto/des/des_locl.h | 15 --- crypto/des/des_opts.c | 10 -- crypto/des/destest.c | 8 -- crypto/des/fcrypt.c | 10 -- crypto/des/read_pwd.c | 11 -- crypto/des/rpc_enc.c | 5 - crypto/des/set_key.c | 5 - crypto/des/speed.c | 10 -- crypto/dh/dh.h | 20 --- crypto/dh/dhtest.c | 5 - crypto/dsa/dsa.h | 41 ------ crypto/dsa/dsatest.c | 5 - crypto/err/err.c | 11 -- crypto/err/err.h | 42 ------ crypto/evp/bio_b64.c | 11 -- crypto/evp/bio_enc.c | 11 -- crypto/evp/bio_md.c | 11 -- crypto/evp/bio_ok.c | 13 -- crypto/evp/e_cbc_3d.c | 7 - crypto/evp/e_cbc_bf.c | 6 - crypto/evp/e_cbc_c.c | 6 - crypto/evp/e_cbc_d.c | 6 - crypto/evp/e_cbc_i.c | 6 - crypto/evp/e_cbc_r2.c | 11 -- crypto/evp/e_cbc_r5.c | 6 - crypto/evp/e_cfb_3d.c | 7 - crypto/evp/e_cfb_bf.c | 6 - crypto/evp/e_cfb_c.c | 6 - crypto/evp/e_cfb_d.c | 6 - crypto/evp/e_cfb_i.c | 6 - crypto/evp/e_cfb_r2.c | 6 - crypto/evp/e_cfb_r5.c | 6 - crypto/evp/e_ecb_3d.c | 7 - crypto/evp/e_ecb_bf.c | 6 - crypto/evp/e_ecb_c.c | 6 - crypto/evp/e_ecb_d.c | 6 - crypto/evp/e_ecb_i.c | 6 - crypto/evp/e_ecb_r2.c | 6 - crypto/evp/e_ecb_r5.c | 6 - crypto/evp/e_null.c | 6 - crypto/evp/e_ofb_3d.c | 7 - crypto/evp/e_ofb_bf.c | 6 - crypto/evp/e_ofb_c.c | 6 - crypto/evp/e_ofb_d.c | 6 - crypto/evp/e_ofb_i.c | 6 - crypto/evp/e_ofb_r2.c | 6 - crypto/evp/e_ofb_r5.c | 6 - crypto/evp/e_rc4.c | 6 - crypto/evp/e_xcbc_d.c | 6 - crypto/evp/evp.h | 148 --------------------- crypto/evp/p_lib.c | 8 -- crypto/hmac/hmac.h | 11 -- crypto/hmac/hmactest.c | 5 - crypto/idea/i_skey.c | 5 - crypto/idea/idea.h | 12 -- crypto/idea/idea_spd.c | 10 -- crypto/idea/ideatest.c | 6 - crypto/lhash/lhash.c | 11 -- crypto/lhash/lhash.h | 21 --- crypto/md2/md2.c | 8 -- crypto/md2/md2.h | 9 -- crypto/md2/md2_dgst.c | 5 - crypto/md2/md2test.c | 5 - crypto/md5/md5.c | 7 - crypto/md5/md5.h | 9 -- crypto/md5/md5_dgst.c | 10 -- crypto/md5/md5_locl.h | 4 - crypto/md5/md5test.c | 5 - crypto/mdc2/mdc2.h | 10 -- crypto/mdc2/mdc2dgst.c | 5 - crypto/objects/obj_dat.c | 7 - crypto/objects/obj_dat.h | 2 +- crypto/objects/objects.h | 32 ----- crypto/pem/pem.h | 83 ------------ crypto/pem/pem_lib.c | 10 -- crypto/pkcs12/p12_bags.c | 5 - crypto/pkcs12/p12_kiss.c | 7 - crypto/pkcs12/p12_lib.c | 5 - crypto/pkcs12/p12_mac.c | 4 - crypto/pkcs12/p12_sbag.c | 5 - crypto/pkcs12/pkcs12.h | 55 -------- crypto/pkcs7/bio_ber.c | 11 -- crypto/pkcs7/pkcs7.h | 92 -------------- crypto/rand/rand.h | 22 ---- crypto/rc2/rc2.h | 13 -- crypto/rc2/rc2speed.c | 10 -- crypto/rc2/rc2test.c | 6 - crypto/rc4/rc4.h | 9 -- crypto/rc4/rc4speed.c | 10 -- crypto/rc5/rc5.h | 13 -- crypto/rc5/rc5speed.c | 10 -- crypto/ripemd/ripemd.h | 9 -- crypto/ripemd/rmd160.c | 7 - crypto/ripemd/rmd_dgst.c | 10 -- crypto/ripemd/rmd_locl.h | 4 - crypto/ripemd/rmdtest.c | 5 - crypto/rsa/rsa.h | 73 ----------- crypto/rsa/rsa_eay.c | 11 -- crypto/rsa/rsa_pk1.c | 12 -- crypto/sha/sha.c | 7 - crypto/sha/sha.h | 14 -- crypto/sha/sha1.c | 7 - crypto/sha/sha1dgst.c | 10 -- crypto/sha/sha1test.c | 5 - crypto/sha/sha_dgst.c | 5 - crypto/sha/shatest.c | 5 - crypto/stack/stack.c | 5 - crypto/stack/stack.h | 20 --- crypto/threads/mttest.c | 23 ---- crypto/threads/th-lock.c | 16 --- crypto/tmdiff.h | 10 -- crypto/txt_db/txt_db.h | 12 -- crypto/x509/by_dir.c | 9 -- crypto/x509/by_file.c | 5 - crypto/x509/x509.h | 325 ----------------------------------------------- crypto/x509/x509_vfy.c | 6 - crypto/x509/x509_vfy.h | 58 --------- crypto/x509v3/v3_akey.c | 13 -- crypto/x509v3/v3_alt.c | 8 -- crypto/x509v3/v3_bcons.c | 13 -- crypto/x509v3/v3_bitst.c | 7 - crypto/x509v3/v3_conf.c | 10 -- crypto/x509v3/v3_cpols.c | 11 -- crypto/x509v3/v3_crld.c | 7 - crypto/x509v3/v3_extku.c | 6 - crypto/x509v3/v3_genn.c | 5 - crypto/x509v3/v3_ia5.c | 7 - crypto/x509v3/v3_pku.c | 14 -- crypto/x509v3/v3_skey.c | 6 - crypto/x509v3/v3_sxnet.c | 12 -- crypto/x509v3/x509v3.h | 140 -------------------- e_os.h | 14 -- mt/mttest.c | 23 ---- rsaref/rsaref.c | 37 ------ rsaref/rsaref.h | 16 --- ssl/bio_ssl.c | 10 -- ssl/s23_clnt.c | 9 -- ssl/s23_lib.c | 11 -- ssl/s23_meth.c | 5 - ssl/s23_srvr.c | 8 -- ssl/s2_clnt.c | 13 -- ssl/s2_lib.c | 5 - ssl/s2_meth.c | 5 - ssl/s2_pkt.c | 15 --- ssl/s2_srvr.c | 13 -- ssl/s3_both.c | 5 - ssl/s3_clnt.c | 26 ---- ssl/s3_lib.c | 21 --- ssl/s3_meth.c | 5 - ssl/s3_pkt.c | 40 ------ ssl/s3_srvr.c | 24 ---- ssl/ssl.h | 242 ----------------------------------- ssl/ssl_asn1.c | 5 - ssl/ssl_locl.h | 135 -------------------- ssl/ssl_rsa.c | 6 - ssl/ssl_sess.c | 6 - ssl/ssltest.c | 14 -- ssl/t1_clnt.c | 5 - ssl/t1_meth.c | 5 - ssl/t1_srvr.c | 5 - util/pl/ultrix.pl | 2 +- 287 files changed, 6 insertions(+), 4253 deletions(-) diff --git a/CHANGES b/CHANGES index 0524c7f12a..ca68c8156d 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ Changes between 0.9.2b and 0.9.3 + *) Remove NOPROTO sections and error code comments. + [Ulf Möller] + *) Partial rewrite of the DEF file generator to now parse the ANSI prototypes. [Steve Henson] diff --git a/apps/apps.c b/apps/apps.c index ba07016e83..d3d601d9ed 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -69,12 +69,7 @@ # include "bss_file.c" #endif -#ifndef NOPROTO int app_init(long mesgwin); -#else -int app_init(); -#endif - #ifdef undef /* never finished - probably never will be :-) */ int args_from_file(char *file, int *argc, char **argv[]) { diff --git a/apps/apps.h b/apps/apps.h index 3ad21bb9a9..1b108ba8e0 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -127,20 +127,11 @@ typedef struct args_st int count; } ARGS; -#ifndef NOPROTO int should_retry(int i); int args_from_file(char *file, int *argc, char **argv[]); int str2fmt(char *s); void program_name(char *in,char *out,int size); int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]); -#else -int should_retry(); -int args_from_file(); -int str2fmt(); -void program_name(); -int chopup_args(); -#endif - #define FORMAT_UNDEF 0 #define FORMAT_ASN1 1 #define FORMAT_TEXT 2 diff --git a/apps/ca.c b/apps/ca.c index 16afb8d7ee..2fe6300216 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -156,7 +156,6 @@ extern int EF_PROTECT_BELOW; extern int EF_ALIGNMENT; #endif -#ifndef NOPROTO static int add_oid_section(LHASH *conf); static void lookup_fail(char *name,char *tag); static int MS_CALLBACK key_callback(char *buf,int len,int verify); @@ -187,27 +186,6 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst, LHASH *conf); static int do_revoke(X509 *x509, TXT_DB *db); static int check_time_format(char *str); -#else -static int add_oid_section(); -static void lookup_fail(); -static int MS_CALLBACK key_callback(); -static unsigned long index_serial_hash(); -static int index_serial_cmp(); -static unsigned long index_name_hash(); -static int index_name_qual(); -static int index_name_cmp(); -static int fix_data(); -static BIGNUM *load_serial(); -static int save_serial(); -static int certify(); -static int certify_cert(); -static int certify_spkac(); -static void write_new_certificate(); -static int do_body(); -static int do_revoke(); -static int check_time_format(); -#endif - static LHASH *conf; static char *key=NULL; static char *section=NULL; diff --git a/apps/crl.c b/apps/crl.c index cdbee4847d..1b04f68ecf 100644 --- a/apps/crl.c +++ b/apps/crl.c @@ -88,12 +88,7 @@ static char *crl_usage[]={ NULL }; -#ifndef NOPROTO static X509_CRL *load_crl(char *file, int format); -#else -static X509_CRL *load_crl(); -#endif - static BIO *bio_out=NULL; int MAIN(int argc, char **argv) diff --git a/apps/crl2p7.c b/apps/crl2p7.c index 12e535a282..611046ecf5 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -72,12 +72,7 @@ #include #include -#ifndef NOPROTO static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile); -#else -static int add_certs_from_file(); -#endif - #undef PROG #define PROG crl2pkcs7_main diff --git a/apps/dgst.c b/apps/dgst.c index 82bb20a8be..2f87147a81 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -73,12 +73,7 @@ #undef PROG #define PROG dgst_main -#ifndef NOPROTO void do_fp(unsigned char *buf,BIO *f,int sep); -#else -void do_fp(); -#endif - int MAIN(int argc, char **argv) { unsigned char *buf=NULL; diff --git a/apps/dsaparam.c b/apps/dsaparam.c index e733b53db4..bd368a3a30 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -83,12 +83,7 @@ * -genkey */ -#ifndef NOPROTO static void MS_CALLBACK dsa_cb(int p, int n, char *arg); -#else -static void MS_CALLBACK dsa_cb(); -#endif - int MAIN(int argc, char **argv) { DSA *dsa=NULL; diff --git a/apps/enc.c b/apps/enc.c index 84a81ffb23..ce5f7f0638 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -70,12 +70,7 @@ #endif #include -#ifndef NOPROTO int set_hex(char *in,unsigned char *out,int size); -#else -int set_hex(); -#endif - #undef SIZE #undef BSIZE #undef PROG diff --git a/apps/gendh.c b/apps/gendh.c index c69147e370..e3be0827c1 100644 --- a/apps/gendh.c +++ b/apps/gendh.c @@ -73,14 +73,8 @@ #undef PROG #define PROG gendh_main -#ifndef NOPROTO static void MS_CALLBACK dh_cb(int p, int n, char *arg); static long dh_load_rand(char *names); -#else -static void MS_CALLBACK dh_cb(); -static long dh_load_rand(); -#endif - int MAIN(int argc, char **argv) { char buffer[200]; diff --git a/apps/gendsa.c b/apps/gendsa.c index db641da503..e43fd6a3a2 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -73,12 +73,7 @@ #undef PROG #define PROG gendsa_main -#ifndef NOPROTO static long dsa_load_rand(char *names); -#else -static long dsa_load_rand(); -#endif - int MAIN(int argc, char **argv) { char buffer[200]; diff --git a/apps/genrsa.c b/apps/genrsa.c index 30f1618f18..2218fb06d2 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -74,14 +74,8 @@ #undef PROG #define PROG genrsa_main -#ifndef NOPROTO static void MS_CALLBACK genrsa_cb(int p, int n, char *arg); static long gr_load_rand(char *names); -#else -static void MS_CALLBACK genrsa_cb(); -static long gr_load_rand(); -#endif - int MAIN(int argc, char **argv) { int ret=1; diff --git a/apps/nseq.c b/apps/nseq.c index 9c84d93b81..5e74082cad 100644 --- a/apps/nseq.c +++ b/apps/nseq.c @@ -65,11 +65,7 @@ #undef PROG #define PROG nseq_main -#ifdef NOPROTO static int dump_cert_text(BIO *out, X509 *x); -#else -static int dump_cert_text(); -#endif int MAIN(int argc, char **argv) { diff --git a/apps/openssl.c b/apps/openssl.c index bae0c4f004..ebc2885a3b 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -83,18 +83,10 @@ #endif */ -#ifndef NOPROTO static unsigned long MS_CALLBACK hash(FUNCTION *a); static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); static LHASH *prog_init(void ); static int do_cmd(LHASH *prog,int argc,char *argv[]); -#else -static unsigned long MS_CALLBACK hash(); -static int MS_CALLBACK cmp(); -static LHASH *prog_init(); -static int do_cmd(); -#endif - LHASH *config=NULL; char *default_config_file=NULL; diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 79fd19a69f..95974f8917 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -76,7 +76,6 @@ EVP_CIPHER *enc; #define CLCERTS 0x8 #define CACERTS 0x10 -#ifndef NOPROTO int get_cert_chain(X509 *cert, STACK **chain); int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options); int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options); @@ -85,17 +84,6 @@ int print_attribs(BIO *out, STACK *attrlst, char *name); void hex_prin(BIO *out, unsigned char *buf, int len); int alg_print(BIO *x, X509_ALGOR *alg); int cert_load(BIO *in, STACK *sk); -#else -int get_cert_chain(); -int dump_certs_keys_p12(); -int dump_certs_pkeys_bags(); -int dump_certs_pkeys_bag(); -int print_attribs(); -void hex_prin(); -int alg_print(); -int cert_load(); -#endif - int MAIN(int argc, char **argv) { char *infile=NULL, *outfile=NULL, *keyname = NULL; diff --git a/apps/progs.h b/apps/progs.h index 216c9d9f2a..f428998922 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -1,6 +1,5 @@ /* This file was generated by progs.pl. */ -#ifndef NOPROTO extern int verify_main(int argc,char *argv[]); extern int asn1parse_main(int argc,char *argv[]); extern int req_main(int argc,char *argv[]); @@ -28,35 +27,6 @@ extern int sess_id_main(int argc,char *argv[]); extern int ciphers_main(int argc,char *argv[]); extern int nseq_main(int argc,char *argv[]); extern int pkcs12_main(int argc,char *argv[]); -#else -extern int verify_main(); -extern int asn1parse_main(); -extern int req_main(); -extern int dgst_main(); -extern int dh_main(); -extern int enc_main(); -extern int gendh_main(); -extern int errstr_main(); -extern int ca_main(); -extern int crl_main(); -extern int rsa_main(); -extern int dsa_main(); -extern int dsaparam_main(); -extern int x509_main(); -extern int genrsa_main(); -extern int gendsa_main(); -extern int s_server_main(); -extern int s_client_main(); -extern int speed_main(); -extern int s_time_main(); -extern int version_main(); -extern int pkcs7_main(); -extern int crl2pkcs7_main(); -extern int sess_id_main(); -extern int ciphers_main(); -extern int nseq_main(); -extern int pkcs12_main(); -#endif #ifdef SSLEAY_SRC /* Defined only in openssl.c. */ diff --git a/apps/progs.pl b/apps/progs.pl index 34dcac1681..16ce5ed562 100644 --- a/apps/progs.pl +++ b/apps/progs.pl @@ -2,17 +2,10 @@ print "/* This file was generated by progs.pl. */\n\n"; -print "#ifndef NOPROTO\n"; - grep(s/^asn1pars$/asn1parse/,@ARGV); foreach (@ARGV) { printf "extern int %s_main(int argc,char *argv[]);\n",$_; } -print "#else\n"; -foreach (@ARGV) - { printf "extern int %s_main();\n",$_; } -print "#endif\n"; - print <<'EOF'; diff --git a/apps/req.c b/apps/req.c index 78a50a5525..5678b707f8 100644 --- a/apps/req.c +++ b/apps/req.c @@ -107,7 +107,6 @@ * require. This format is wrong */ -#ifndef NOPROTO static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,int attribs); static int add_attribute_object(STACK *n, char *text, char *def, char *value, int nid,int min,int max); @@ -117,16 +116,6 @@ static void MS_CALLBACK req_cb(int p,int n,char *arg); static int req_fix_data(int nid,int *type,int len,int min,int max); static int check_end(char *str, char *end); static int add_oid_section(LHASH *conf); -#else -static int make_REQ(); -static int add_attribute_object(); -static int add_DN_object(); -static void MS_CALLBACK req_cb(); -static int req_fix_data(); -static int check_end(); -static int add_oid_section(); -#endif - #ifndef MONOLITH static char *default_config_file=NULL; static LHASH *config=NULL; diff --git a/apps/s_apps.h b/apps/s_apps.h index 4ce6725d2b..68d6a73b9b 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -60,7 +60,6 @@ #define PORT_STR "4433" #define PROTOCOL "tcp" -#ifndef NOPROTO int do_accept(int acc_sock, int *sock, char **host); int do_server(int port, int *ret, int (*cb) (), char *context); #ifdef HEADER_X509_H @@ -95,25 +94,3 @@ void MS_CALLBACK apps_ssl_info_callback(SSL *s, int where, int ret); void MS_CALLBACK apps_ssl_info_callback(char *s, int where, int ret); #endif -#else -int do_accept(); -int do_server(); -int MS_CALLBACK verify_callback(); -int set_cert_stuff(); -int init_client(); -int init_client_ip(); -int nbio_init_client_ip(); -int nbio_sock_error(); -int spawn(); -int init_server(); -int should_retry(); -void sock_cleanup(); -int extract_port(); -int extract_host_port(); -int host_ip(); - -long MS_CALLBACK bio_dump_cb(); -void MS_CALLBACK apps_ssl_info_callback(); - -#endif - diff --git a/apps/s_client.c b/apps/s_client.c index 9e90b483f2..ae3ce3e4e8 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -92,14 +92,8 @@ static int c_Pause=0; static int c_debug=0; static int c_showcerts=0; -#ifndef NOPROTO static void sc_usage(void); static void print_stuff(BIO *berr,SSL *con,int full); -#else -static void sc_usage(); -static void print_stuff(); -#endif - static BIO *bio_c_out=NULL; static int c_quiet=0; diff --git a/apps/s_server.c b/apps/s_server.c index 0198cb8a05..dc218db924 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -74,7 +74,6 @@ #include #include "s_apps.h" -#ifndef NOPROTO static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength); static int sv_body(char *hostname, int s, unsigned char *context); static int www_body(char *hostname, int s, unsigned char *context); @@ -87,21 +86,6 @@ static DH *load_dh_param(void ); static DH *get_dh512(void); #endif /* static void s_server_init(void);*/ -#else -static RSA MS_CALLBACK *tmp_rsa_cb(); -static int sv_body(); -static int www_body(); -static void close_accept_socket(); -static void sv_usage(); -static int init_ssl_connection(); -static void print_stats(); -#ifndef NO_DH -static DH *load_dh_param(); -static DH *get_dh512(); -#endif -/* static void s_server_init(); */ -#endif - #ifndef S_ISDIR #define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR) diff --git a/apps/s_socket.c b/apps/s_socket.c index 9110234ed2..724d48a071 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -69,14 +69,8 @@ #include "s_apps.h" #include -#ifndef NOPROTO static struct hostent *GetHostByName(char *name); int sock_init(void ); -#else -static struct hostent *GetHostByName(); -int sock_init(); -#endif - #ifdef WIN16 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ #else diff --git a/apps/s_time.c b/apps/s_time.c index 187c09d12e..ae16192f5e 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -151,18 +151,10 @@ struct tms { extern int verify_depth; extern int verify_error; -#ifndef NOPROTO static void s_time_usage(void); static int parseArgs( int argc, char **argv ); static SSL *doConnection( SSL *scon ); static void s_time_init(void); -#else -static void s_time_usage(); -static int parseArgs(); -static SSL *doConnection(); -static void s_time_init(); -#endif - /*********************************************************************** * Static data declarations diff --git a/apps/sc.c b/apps/sc.c index e6da658f06..d1b6af6787 100644 --- a/apps/sc.c +++ b/apps/sc.c @@ -99,14 +99,8 @@ static int c_nbio=0; static int c_Pause=0; static int c_debug=0; -#ifndef NOPROTO static void sc_usage(void); static void print_stuff(BIO *berr,SSL *con,int full); -#else -static void sc_usage(); -static void print_stuff(); -#endif - static BIO *bio_c_out=NULL; static int c_quiet=0; diff --git a/apps/sess_id.c b/apps/sess_id.c index 11cf837267..eb84e2528d 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -83,12 +83,7 @@ static char *sess_id_usage[]={ NULL }; -#ifndef NOPROTO static SSL_SESSION *load_sess_id(char *file, int format); -#else -static SSL_SESSION *load_sess_id(); -#endif - int MAIN(int argc, char **argv) { SSL_SESSION *x=NULL; diff --git a/apps/speed.c b/apps/speed.c index d6ee53e9fe..ce489e6055 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -181,16 +181,9 @@ struct tms { #define BUFSIZE ((long)1024*8+1) int run=0; -#ifndef NOPROTO static double Time_F(int s); static void print_message(char *s,long num,int length); static void pkey_print_message(char *str,char *str2,long num,int bits,int sec); -#else -static double Time_F(); -static void print_message(); -static void pkey_print_message(); -#endif - #ifdef SIGALRM #if defined(__STDC__) || defined(sgi) || defined(_AIX) #define SIGRETTYPE void @@ -198,12 +191,7 @@ static void pkey_print_message(); #define SIGRETTYPE int #endif -#ifndef NOPROTO static SIGRETTYPE sig_done(int sig); -#else -static SIGRETTYPE sig_done(); -#endif - static SIGRETTYPE sig_done(int sig) { signal(SIGALRM,sig_done); diff --git a/apps/testdsa.h b/apps/testdsa.h index 8e8aea617a..a322978f8c 100644 --- a/apps/testdsa.h +++ b/apps/testdsa.h @@ -1,14 +1,7 @@ /* NOCW */ -#ifndef NOPROTO DSA *get_dsa512(void ); DSA *get_dsa1024(void ); DSA *get_dsa2048(void ); -#else -DSA *get_dsa512(); -DSA *get_dsa1024(); -DSA *get_dsa2048(); -#endif - static unsigned char dsa512_p[]={ 0x9D,0x1B,0x69,0x8E,0x26,0xDB,0xF2,0x2B,0x11,0x70,0x19,0x86, 0xF6,0x19,0xC8,0xF8,0x19,0xF2,0x18,0x53,0x94,0x46,0x06,0xD0, diff --git a/apps/verify.c b/apps/verify.c index aa6ee03a1d..119709f5b4 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -68,14 +68,8 @@ #undef PROG #define PROG verify_main -#ifndef NOPROTO static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx); static int check(X509_STORE *ctx,char *file); -#else -static int MS_CALLBACK cb(); -static int check(); -#endif - static int v_verbose=0; int MAIN(int argc, char **argv) diff --git a/apps/x509.c b/apps/x509.c index f336f24077..01fabbb4bf 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -117,7 +117,6 @@ static char *x509_usage[]={ NULL }; -#ifndef NOPROTO static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx); static EVP_PKEY *load_key(char *file, int format); static X509 *load_cert(char *file, int format); @@ -125,14 +124,6 @@ static int sign (X509 *x, EVP_PKEY *pkey,int days,const EVP_MD *digest); static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest, X509 *x,X509 *xca,EVP_PKEY *pkey,char *serial, int create,int days); -#else -static int MS_CALLBACK callb(); -static EVP_PKEY *load_key(); -static X509 *load_cert(); -static int sign (); -static int x509_certify (); -#endif - static int reqfile=0; int MAIN(int argc, char **argv) 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 -/* 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 -/* 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 -/* 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 -/* 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 -/* 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 #include -/* - * 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 -/* 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 #include -/* 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 -/* 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 -/* 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 -/* 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 -/* 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 -/* 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 -/* 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 -/* 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 #include -#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 #include -#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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 */ +/* Original version from Steven Schoch */ #include #include "cryptlib.h" @@ -65,12 +65,6 @@ #include #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 -/* - *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 #include -/* - * 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 #include -#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 #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 -/* - * 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 #include -/* - * 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 -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* - * 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 #include -/* 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 -/* - * 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 #include -/* - * 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 -/* - * 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 #include -/* - * 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 -/* 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 #include -/* - * 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, diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c index f63fa8e168..7253d765e9 100644 --- a/crypto/bf/bf_opts.c +++ b/crypto/bf/bf_opts.c @@ -143,12 +143,7 @@ struct tms { #define BUFSIZE ((long)1024) long run=0; -#ifndef NOPROTO double Time_F(int s); -#else -double Time_F(); -#endif - #ifdef SIGALRM #if defined(__STDC__) || defined(sgi) #define SIGRETTYPE void @@ -156,12 +151,7 @@ double Time_F(); #define SIGRETTYPE int #endif -#ifndef NOPROTO SIGRETTYPE sig_done(int sig); -#else -SIGRETTYPE sig_done(); -#endif - SIGRETTYPE sig_done(int sig) { signal(SIGALRM,sig_done); diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c index 8e770a9f83..bca36e5a3b 100644 --- a/crypto/bf/bfspeed.c +++ b/crypto/bf/bfspeed.c @@ -116,12 +116,7 @@ struct tms { #define BUFSIZE ((long)1024) long run=0; -#ifndef NOPROTO double Time_F(int s); -#else -double Time_F(); -#endif - #ifdef SIGALRM #if defined(__STDC__) || defined(sgi) || defined(_AIX) #define SIGRETTYPE void @@ -129,12 +124,7 @@ double Time_F(); #define SIGRETTYPE int #endif -#ifndef NOPROTO SIGRETTYPE sig_done(int sig); -#else -SIGRETTYPE sig_done(); -#endif - SIGRETTYPE sig_done(int sig) { signal(SIGALRM,sig_done); diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c index df4c211d9d..091c8081a9 100644 --- a/crypto/bf/bftest.c +++ b/crypto/bf/bftest.c @@ -252,14 +252,8 @@ unsigned char key_out[KEY_TEST_NUM][8]={ {0x05,0x04,0x4B,0x62,0xFA,0x52,0xD0,0x80}, }; -#ifndef NOPROTO static int test(void ); static int print_test_data(void ); -#else -static int test(); -static int print_test_data(); -#endif - int main(int argc, char *argv[]) { int ret; diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index 4e5698f3d7..005d0ed7b6 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -81,7 +81,6 @@ typedef struct bf_key_st BF_LONG S[4*256]; } BF_KEY; -#ifndef NOPROTO void BF_set_key(BF_KEY *key, int len, unsigned char *data); void BF_ecb_encrypt(unsigned char *in,unsigned char *out,BF_KEY *key, @@ -96,19 +95,6 @@ void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, BF_KEY *schedule, unsigned char *ivec, int *num); const char *BF_options(void); -#else - -void BF_set_key(); -void BF_ecb_encrypt(); -void BF_encrypt(); -void BF_decrypt(); -void BF_cbc_encrypt(); -void BF_cfb64_encrypt(); -void BF_ofb64_encrypt(); -const char *BF_options(); - -#endif - #ifdef __cplusplu