Subject: CVS commit: src/crypto/dist/openssl
To: None <source-changes@NetBSD.org>
From: Christos Zoulas <christos@netbsd.org>
List: source-changes
Date: 11/25/2005 19:14:16
Module Name:	src
Committed By:	christos
Date:		Fri Nov 25 19:14:16 UTC 2005

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ PROBLEMS e_os.h e_os2.h
	src/crypto/dist/openssl/apps: CA.pl.in apps.h ca.c dgst.c dhparam.c
	    enc.c openssl.c openssl.cnf passwd.c progs.h rand.c req.c s_apps.h
	    s_time.c smime.c speed.c spkac.c
	src/crypto/dist/openssl/crypto: cryptlib.c cryptlib.h crypto.h
	    cversion.c ebcdic.c md32_common.h mem_dbg.c opensslconf.h
	    opensslconf.h.in opensslv.h ossl_typ.h symhacks.h tmdiff.c uid.c
	src/crypto/dist/openssl/crypto/aes: aes.h aes_locl.h
	src/crypto/dist/openssl/crypto/asn1: a_gentm.c a_mbstr.c a_utctm.c
	    asn1.h asn1_lib.c asn1_par.c asn1t.h t_pkey.c t_req.c t_spki.c
	    tasn_dec.c x_x509a.c
	src/crypto/dist/openssl/crypto/bf: bf_locl.h bf_opts.c bfspeed.c
	    blowfish.h
	src/crypto/dist/openssl/crypto/bio: b_dump.c b_print.c b_sock.c bio.h
	    bss_conn.c bss_file.c bss_log.c
	src/crypto/dist/openssl/crypto/bn: bn.h bn_ctx.c bn_lib.c bn_print.c
	    bntest.c exptest.c
	src/crypto/dist/openssl/crypto/cast: cast.h cast_lcl.h cast_spd.c
	    castopts.c
	src/crypto/dist/openssl/crypto/conf: conf.h conf_def.c conf_mod.c
	src/crypto/dist/openssl/crypto/des: des.h des_locl.h des_old.h
	    des_opts.c fcrypt.c speed.c
	src/crypto/dist/openssl/crypto/dh: dh.h dhtest.c
	src/crypto/dist/openssl/crypto/dsa: dsa.h dsa_ossl.c
	src/crypto/dist/openssl/crypto/dso: dso_dl.c dso_dlfcn.c dso_win32.c
	src/crypto/dist/openssl/crypto/ec: ec.h
	src/crypto/dist/openssl/crypto/engine: eng_all.c engine.h
	src/crypto/dist/openssl/crypto/err: err.c err.h err_prn.c
	src/crypto/dist/openssl/crypto/evp: c_all.c c_alld.c evp.h evp_pbe.c
	    evp_pkey.c
	src/crypto/dist/openssl/crypto/hmac: hmac.h
	src/crypto/dist/openssl/crypto/idea: i_skey.c idea.h idea_spd.c
	src/crypto/dist/openssl/crypto/lhash: lhash.c lhash.h
	src/crypto/dist/openssl/crypto/md2: md2.h md2test.c
	src/crypto/dist/openssl/crypto/md4: md4.h md4_dgst.c md4_locl.h
	    md4test.c
	src/crypto/dist/openssl/crypto/md5: md5.h md5_dgst.c md5_locl.h
	    md5test.c
	src/crypto/dist/openssl/crypto/mdc2: mdc2.h
	src/crypto/dist/openssl/crypto/objects: o_names.c obj_dat.c
	src/crypto/dist/openssl/crypto/pem: pem.h pem_lib.c
	src/crypto/dist/openssl/crypto/pkcs12: p12_decr.c p12_npas.c
	src/crypto/dist/openssl/crypto/pkcs7: bio_ber.c pk7_attr.c pk7_doit.c
	    pk7_mime.c pk7_smime.c pkcs7.h
	src/crypto/dist/openssl/crypto/rand: md_rand.c rand.h rand_egd.c
	    rand_lcl.h randfile.c
	src/crypto/dist/openssl/crypto/rc2: rc2.h rc2speed.c
	src/crypto/dist/openssl/crypto/rc4: rc4.h rc4speed.c
	src/crypto/dist/openssl/crypto/rc5: rc5.h rc5_locl.h rc5speed.c
	src/crypto/dist/openssl/crypto/ripemd: ripemd.h rmd_dgst.c rmd_locl.h
	    rmdtest.c
	src/crypto/dist/openssl/crypto/rsa: rsa.h rsa_eay.c rsa_lib.c
	    rsa_test.c
	src/crypto/dist/openssl/crypto/sha: sha.h sha1test.c sha256.c
	    sha_locl.h shatest.c
	src/crypto/dist/openssl/crypto/threads: mttest.c th-lock.c
	src/crypto/dist/openssl/crypto/txt_db: txt_db.h
	src/crypto/dist/openssl/crypto/ui: ui_lib.c ui_openssl.c
	src/crypto/dist/openssl/crypto/x509: by_dir.c x509.h x509_trs.c
	    x509_txt.c x509_vfy.c x509_vfy.h x509spki.c
	src/crypto/dist/openssl/crypto/x509v3: v3_alt.c v3_info.c v3_purp.c
	src/crypto/dist/openssl/demos/easy_tls: Makefile cacerts.pem cert.pem
	    easy-tls.c easy-tls.h test.c test.h
	src/crypto/dist/openssl/demos/engines/ibmca: ica_openssl_api.h
	src/crypto/dist/openssl/demos/tunala: tunala.h
	src/crypto/dist/openssl/doc/apps: CA.pl.pod ca.pod enc.pod req.pod
	    s_client.pod s_server.pod x509.pod
	src/crypto/dist/openssl/doc/crypto: EVP_DigestInit.pod
	    EVP_EncryptInit.pod EVP_SealInit.pod bn.pod bn_internal.pod
	    des_modes.pod threads.pod
	src/crypto/dist/openssl/engines/vendor_defns: hwcryptohook.h
	src/crypto/dist/openssl/shlib: Makefile.hpux10-cc hpux10-cc.sh
	src/crypto/dist/openssl/ssl: s23_srvr.c s2_clnt.c s2_lib.c s2_srvr.c
	    s3_clnt.c s3_lib.c s3_pkt.c s3_srvr.c ssl.h ssl2.h ssl3.h
	    ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_locl.h ssl_sess.c
	    ssltest.c
	src/crypto/dist/openssl/util: mkdef.pl pod2man.pl selftest.pl
Added Files:
	src/crypto/dist/openssl: openssl2netbsd
Removed Files:
	src/crypto/dist/openssl: x
	src/crypto/dist/openssl/bugs: VC16.bug
	src/crypto/dist/openssl/crypto/bn/asm: alpha.s alpha.s.works
	    bn-alpha.pl ca.pl co-alpha.pl mips1.s pa-risc.s r3000.s
	src/crypto/dist/openssl/crypto/bn/asm/alpha: add.pl div.pl mul.pl
	    mul_add.pl mul_c4.pl mul_c4.works.pl mul_c8.pl sqr.pl sqr_c4.pl
	    sqr_c8.pl sub.pl
	src/crypto/dist/openssl/crypto/bn/asm/alpha.works: add.pl div.pl mul.pl
	    mul_add.pl mul_c4.pl mul_c4.works.pl mul_c8.pl sqr.pl sqr_c4.pl
	    sqr_c8.pl sub.pl
	src/crypto/dist/openssl/crypto/ec: ecp_recp.c
	src/crypto/dist/openssl/crypto/engine: hw.ec hw_4758_cca.c
	    hw_4758_cca_err.c hw_4758_cca_err.h hw_aep.c hw_aep_err.c
	    hw_aep_err.h hw_atalla.c hw_atalla_err.c hw_atalla_err.h
	    hw_cryptodev.c hw_cswift.c hw_cswift_err.c hw_cswift_err.h
	    hw_ncipher.c hw_ncipher_err.c hw_ncipher_err.h hw_nuron.c
	    hw_nuron_err.c hw_nuron_err.h hw_sureware.c hw_sureware_err.c
	    hw_sureware_err.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h
	src/crypto/dist/openssl/crypto/engine/vendor_defns: aep.h atalla.h
	    cswift.h hw_4758_cca.h hw_ubsec.h hwcryptohook.h sureware.h
	src/crypto/dist/openssl/crypto/perlasm: alpha.pl
	src/crypto/dist/openssl/crypto/rc4/asm: rc4-amd64.pl
	src/crypto/dist/openssl/fips: Makefile fingerprint.sha1 fips-lib.com
	    fips.c fips.h fips_check_sha1 fips_err.h fips_err_wrapper.c
	    fips_locl.h fips_make_sha1 fips_test_suite.c install.com
	    openssl_fips_fingerprint
	src/crypto/dist/openssl/fips/aes: Makefile fingerprint.sha1
	    fips_aes_core.c fips_aes_locl.h fips_aes_selftest.c fips_aesavs.c
	src/crypto/dist/openssl/fips/des: Makefile fingerprint.sha1
	    fips_des_enc.c fips_des_locl.h fips_des_selftest.c fips_desmovs.c
	    fips_set_key.c
	src/crypto/dist/openssl/fips/des/asm: fips-dx86-elf.s
	src/crypto/dist/openssl/fips/dh: Makefile fingerprint.sha1
	    fips_dh_check.c fips_dh_gen.c fips_dh_key.c
	src/crypto/dist/openssl/fips/dsa: Makefile fingerprint.sha1
	    fips_dsa_gen.c fips_dsa_ossl.c fips_dsa_selftest.c fips_dsatest.c
	    fips_dssvs.c
	src/crypto/dist/openssl/fips/rand: Makefile fingerprint.sha1
	    fips_rand.c fips_rand.h fips_randtest.c
	src/crypto/dist/openssl/fips/rsa: Makefile fingerprint.sha1
	    fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c
	src/crypto/dist/openssl/fips/sha1: Makefile fingerprint.sha1
	    fips_md32_common.h fips_sha1_selftest.c fips_sha1dgst.c
	    fips_sha1test.c fips_sha_locl.h fips_standalone_sha1.c
	    sha1hashes.txt sha1vectors.txt standalone.sha1
	src/crypto/dist/openssl/fips/sha1/asm: sx86-elf.s
	src/crypto/dist/openssl/ms: 16all.bat speed16.bat
	src/crypto/dist/openssl/test: sha1hashes.txt sha1vectors.txt
	    testfipsssl
	src/crypto/dist/openssl/util/pl: BC-16.pl VC-16.pl VC-CE.pl

Log Message:
Resolve conflicts:
1. Instead of trying to cleanup the ugly ifdefs, we leave them alone so that
   there are going to be fewer conflicts in the future.
2. Where we make changes to override things #ifdef __NetBSD__ around them
   so that it is clear what we are changing. This is still missing in some
   places, notably in opensslconf.h because it would make things messier.


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/PROBLEMS \
    src/crypto/dist/openssl/e_os2.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/e_os.h
cvs rdiff -r0 -r1.1 src/crypto/dist/openssl/openssl2netbsd
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/x
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/apps/CA.pl.in \
    src/crypto/dist/openssl/apps/speed.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/apps/apps.h \
    src/crypto/dist/openssl/apps/ca.c src/crypto/dist/openssl/apps/dgst.c \
    src/crypto/dist/openssl/apps/req.c src/crypto/dist/openssl/apps/s_time.c \
    src/crypto/dist/openssl/apps/smime.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/apps/dhparam.c \
    src/crypto/dist/openssl/apps/openssl.c \
    src/crypto/dist/openssl/apps/openssl.cnf \
    src/crypto/dist/openssl/apps/passwd.c src/crypto/dist/openssl/apps/rand.c \
    src/crypto/dist/openssl/apps/spkac.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/apps/enc.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/apps/progs.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/apps/s_apps.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/bugs/VC16.bug
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/cryptlib.c \
    src/crypto/dist/openssl/crypto/md32_common.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/cryptlib.h \
    src/crypto/dist/openssl/crypto/crypto.h \
    src/crypto/dist/openssl/crypto/mem_dbg.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/cversion.c \
    src/crypto/dist/openssl/crypto/ebcdic.c \
    src/crypto/dist/openssl/crypto/opensslconf.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/opensslconf.h.in \
    src/crypto/dist/openssl/crypto/symhacks.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/opensslv.h \
    src/crypto/dist/openssl/crypto/ossl_typ.h \
    src/crypto/dist/openssl/crypto/tmdiff.c \
    src/crypto/dist/openssl/crypto/uid.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/aes/aes.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/aes/aes_locl.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/asn1/a_gentm.c \
    src/crypto/dist/openssl/crypto/asn1/a_mbstr.c \
    src/crypto/dist/openssl/crypto/asn1/a_utctm.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/asn1/asn1.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/asn1/asn1_lib.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/asn1/asn1_par.c \
    src/crypto/dist/openssl/crypto/asn1/t_pkey.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/asn1/asn1t.h \
    src/crypto/dist/openssl/crypto/asn1/t_spki.c \
    src/crypto/dist/openssl/crypto/asn1/tasn_dec.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/asn1/t_req.c \
    src/crypto/dist/openssl/crypto/asn1/x_x509a.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/bf/bf_locl.h \
    src/crypto/dist/openssl/crypto/bf/bf_opts.c \
    src/crypto/dist/openssl/crypto/bf/bfspeed.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/bf/blowfish.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/bio/b_dump.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/bio/b_print.c \
    src/crypto/dist/openssl/crypto/bio/b_sock.c \
    src/crypto/dist/openssl/crypto/bio/bss_conn.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/bio/bio.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/bio/bss_file.c \
    src/crypto/dist/openssl/crypto/bio/bss_log.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/bn/bn_ctx.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/bn/bn_lib.c \
    src/crypto/dist/openssl/crypto/bn/bntest.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/bn/exptest.c
cvs rdiff -r1.1.1.2 -r0 src/crypto/dist/openssl/crypto/bn/asm/alpha.s
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/bn/asm/alpha.s.works \
    src/crypto/dist/openssl/crypto/bn/asm/bn-alpha.pl \
    src/crypto/dist/openssl/crypto/bn/asm/ca.pl \
    src/crypto/dist/openssl/crypto/bn/asm/co-alpha.pl \
    src/crypto/dist/openssl/crypto/bn/asm/mips1.s \
    src/crypto/dist/openssl/crypto/bn/asm/pa-risc.s \
    src/crypto/dist/openssl/crypto/bn/asm/r3000.s
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/bn/asm/alpha/add.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/div.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/mul.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/mul_add.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/mul_c4.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/mul_c4.works.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/mul_c8.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/sqr.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/sqr_c4.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/sqr_c8.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha/sub.pl
cvs rdiff -r1.1.1.1 -r0 \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/add.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/div.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/mul.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/mul_add.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/mul_c4.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/mul_c8.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/sqr.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl \
    src/crypto/dist/openssl/crypto/bn/asm/alpha.works/sub.pl
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/cast/cast.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/cast/cast_lcl.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/cast/cast_spd.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/cast/castopts.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/conf/conf.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/conf/conf_def.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/conf/conf_mod.c
cvs rdiff -r1.16 -r1.17 src/crypto/dist/openssl/crypto/des/des.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/des/des_locl.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/des/des_old.h \
    src/crypto/dist/openssl/crypto/des/speed.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/des/des_opts.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/des/fcrypt.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/dh/dh.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/dh/dhtest.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/dsa/dsa.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/dsa/dsa_ossl.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/dso/dso_dl.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/dso/dso_dlfcn.c \
    src/crypto/dist/openssl/crypto/dso/dso_win32.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/ec/ec.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/ec/ecp_recp.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/engine/eng_all.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/engine/engine.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/engine/hw.ec \
    src/crypto/dist/openssl/crypto/engine/hw_4758_cca.c \
    src/crypto/dist/openssl/crypto/engine/hw_4758_cca_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_4758_cca_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_aep.c \
    src/crypto/dist/openssl/crypto/engine/hw_aep_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_aep_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_atalla.c \
    src/crypto/dist/openssl/crypto/engine/hw_atalla_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_atalla_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_cswift_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_cswift_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_ncipher.c \
    src/crypto/dist/openssl/crypto/engine/hw_ncipher_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_ncipher_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_nuron.c \
    src/crypto/dist/openssl/crypto/engine/hw_nuron_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_nuron_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_sureware.c \
    src/crypto/dist/openssl/crypto/engine/hw_sureware_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_sureware_err.h \
    src/crypto/dist/openssl/crypto/engine/hw_ubsec_err.c \
    src/crypto/dist/openssl/crypto/engine/hw_ubsec_err.h
cvs rdiff -r1.5 -r0 src/crypto/dist/openssl/crypto/engine/hw_cryptodev.c
cvs rdiff -r1.2 -r0 src/crypto/dist/openssl/crypto/engine/hw_cswift.c
cvs rdiff -r1.1.1.2 -r0 src/crypto/dist/openssl/crypto/engine/hw_ubsec.c
cvs rdiff -r1.1.1.1 -r0 \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/aep.h \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/atalla.h \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/hw_ubsec.h
cvs rdiff -r1.2 -r0 \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/cswift.h \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/hw_4758_cca.h
cvs rdiff -r1.1.1.2 -r0 \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/hwcryptohook.h
cvs rdiff -r1.3 -r0 \
    src/crypto/dist/openssl/crypto/engine/vendor_defns/sureware.h
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/err/err.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/err/err.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/err/err_prn.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/evp/c_all.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/evp/c_alld.c \
    src/crypto/dist/openssl/crypto/evp/evp_pkey.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/evp/evp.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/evp/evp_pbe.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/hmac/hmac.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/idea/i_skey.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/idea/idea.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/idea/idea_spd.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/lhash/lhash.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/lhash/lhash.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/md2/md2.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/md2/md2test.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/md4/md4.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/md4/md4_dgst.c \
    src/crypto/dist/openssl/crypto/md4/md4_locl.h \
    src/crypto/dist/openssl/crypto/md4/md4test.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/md5/md5.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/md5/md5_dgst.c \
    src/crypto/dist/openssl/crypto/md5/md5_locl.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/md5/md5test.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/mdc2/mdc2.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/objects/o_names.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/objects/obj_dat.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/pem/pem.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/pem/pem_lib.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/perlasm/alpha.pl
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/pkcs12/p12_decr.c \
    src/crypto/dist/openssl/crypto/pkcs12/p12_npas.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/pkcs7/bio_ber.c \
    src/crypto/dist/openssl/crypto/pkcs7/pk7_doit.c \
    src/crypto/dist/openssl/crypto/pkcs7/pk7_mime.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/pkcs7/pk7_attr.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/pkcs7/pk7_smime.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/rand/md_rand.c \
    src/crypto/dist/openssl/crypto/rand/rand_egd.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/rand/rand.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/rand/rand_lcl.h
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/crypto/rand/randfile.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rc2/rc2.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/rc2/rc2speed.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rc4/rc4.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/rc4/rc4speed.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/crypto/rc4/asm/rc4-amd64.pl
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/rc5/rc5.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/rc5/rc5_locl.h \
    src/crypto/dist/openssl/crypto/rc5/rc5speed.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/ripemd/ripemd.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/ripemd/rmd_dgst.c \
    src/crypto/dist/openssl/crypto/ripemd/rmd_locl.h \
    src/crypto/dist/openssl/crypto/ripemd/rmdtest.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/rsa/rsa.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rsa/rsa_eay.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/rsa/rsa_lib.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/rsa/rsa_test.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/sha/sha.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/sha/sha1test.c
cvs rdiff -r1.1.1.1 -r1.2 src/crypto/dist/openssl/crypto/sha/sha256.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/sha/sha_locl.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/sha/shatest.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/threads/mttest.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/threads/th-lock.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/txt_db/txt_db.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/ui/ui_lib.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/ui/ui_openssl.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/x509/by_dir.c \
    src/crypto/dist/openssl/crypto/x509/x509spki.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/x509/x509.h \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/x509/x509_trs.c \
    src/crypto/dist/openssl/crypto/x509/x509_txt.c \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/x509v3/v3_alt.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/x509v3/v3_info.c \
    src/crypto/dist/openssl/crypto/x509v3/v3_purp.c
cvs rdiff -r1.1.1.3 -r1.2 src/crypto/dist/openssl/demos/easy_tls/Makefile \
    src/crypto/dist/openssl/demos/easy_tls/cacerts.pem \
    src/crypto/dist/openssl/demos/easy_tls/cert.pem \
    src/crypto/dist/openssl/demos/easy_tls/easy-tls.c \
    src/crypto/dist/openssl/demos/easy_tls/easy-tls.h \
    src/crypto/dist/openssl/demos/easy_tls/test.c \
    src/crypto/dist/openssl/demos/easy_tls/test.h
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/openssl/demos/engines/ibmca/ica_openssl_api.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/demos/tunala/tunala.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/apps/CA.pl.pod \
    src/crypto/dist/openssl/doc/apps/req.pod \
    src/crypto/dist/openssl/doc/apps/x509.pod
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/doc/apps/ca.pod \
    src/crypto/dist/openssl/doc/apps/s_client.pod
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/apps/enc.pod \
    src/crypto/dist/openssl/doc/apps/s_server.pod
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \
    src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/crypto/EVP_SealInit.pod \
    src/crypto/dist/openssl/doc/crypto/bn.pod \
    src/crypto/dist/openssl/doc/crypto/des_modes.pod \
    src/crypto/dist/openssl/doc/crypto/threads.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/crypto/bn_internal.pod
cvs rdiff -r1.1.1.1 -r1.2 \
    src/crypto/dist/openssl/engines/vendor_defns/hwcryptohook.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/Makefile \
    src/crypto/dist/openssl/fips/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/fips-lib.com \
    src/crypto/dist/openssl/fips/fips.c src/crypto/dist/openssl/fips/fips.h \
    src/crypto/dist/openssl/fips/fips_check_sha1 \
    src/crypto/dist/openssl/fips/fips_err.h \
    src/crypto/dist/openssl/fips/fips_err_wrapper.c \
    src/crypto/dist/openssl/fips/fips_locl.h \
    src/crypto/dist/openssl/fips/fips_make_sha1 \
    src/crypto/dist/openssl/fips/fips_test_suite.c \
    src/crypto/dist/openssl/fips/install.com \
    src/crypto/dist/openssl/fips/openssl_fips_fingerprint
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/aes/Makefile \
    src/crypto/dist/openssl/fips/aes/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/aes/fips_aes_selftest.c \
    src/crypto/dist/openssl/fips/aes/fips_aesavs.c
cvs rdiff -r1.3 -r0 src/crypto/dist/openssl/fips/aes/fips_aes_core.c
cvs rdiff -r1.2 -r0 src/crypto/dist/openssl/fips/aes/fips_aes_locl.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/des/Makefile \
    src/crypto/dist/openssl/fips/des/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/des/fips_des_enc.c \
    src/crypto/dist/openssl/fips/des/fips_des_locl.h \
    src/crypto/dist/openssl/fips/des/fips_des_selftest.c \
    src/crypto/dist/openssl/fips/des/fips_desmovs.c \
    src/crypto/dist/openssl/fips/des/fips_set_key.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/des/asm/fips-dx86-elf.s
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/dh/Makefile \
    src/crypto/dist/openssl/fips/dh/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/dh/fips_dh_check.c \
    src/crypto/dist/openssl/fips/dh/fips_dh_gen.c \
    src/crypto/dist/openssl/fips/dh/fips_dh_key.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/dsa/Makefile \
    src/crypto/dist/openssl/fips/dsa/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/dsa/fips_dsa_gen.c \
    src/crypto/dist/openssl/fips/dsa/fips_dsa_ossl.c \
    src/crypto/dist/openssl/fips/dsa/fips_dsa_selftest.c \
    src/crypto/dist/openssl/fips/dsa/fips_dsatest.c \
    src/crypto/dist/openssl/fips/dsa/fips_dssvs.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/rand/Makefile \
    src/crypto/dist/openssl/fips/rand/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/rand/fips_rand.c \
    src/crypto/dist/openssl/fips/rand/fips_rand.h \
    src/crypto/dist/openssl/fips/rand/fips_randtest.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/rsa/Makefile \
    src/crypto/dist/openssl/fips/rsa/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/rsa/fips_rsa_eay.c \
    src/crypto/dist/openssl/fips/rsa/fips_rsa_selftest.c
cvs rdiff -r1.2 -r0 src/crypto/dist/openssl/fips/rsa/fips_rsa_gen.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/sha1/Makefile \
    src/crypto/dist/openssl/fips/sha1/fingerprint.sha1 \
    src/crypto/dist/openssl/fips/sha1/fips_md32_common.h \
    src/crypto/dist/openssl/fips/sha1/fips_sha1_selftest.c \
    src/crypto/dist/openssl/fips/sha1/fips_sha1dgst.c \
    src/crypto/dist/openssl/fips/sha1/fips_sha1test.c \
    src/crypto/dist/openssl/fips/sha1/fips_sha_locl.h \
    src/crypto/dist/openssl/fips/sha1/sha1hashes.txt \
    src/crypto/dist/openssl/fips/sha1/sha1vectors.txt \
    src/crypto/dist/openssl/fips/sha1/standalone.sha1
cvs rdiff -r1.2 -r0 src/crypto/dist/openssl/fips/sha1/fips_standalone_sha1.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/fips/sha1/asm/sx86-elf.s
cvs rdiff -r1.1.1.2 -r0 src/crypto/dist/openssl/ms/16all.bat
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/ms/speed16.bat
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/shlib/Makefile.hpux10-cc
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/shlib/hpux10-cc.sh
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/ssl/s23_srvr.c \
    src/crypto/dist/openssl/ssl/ssl2.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/ssl/s2_clnt.c \
    src/crypto/dist/openssl/ssl/s2_srvr.c src/crypto/dist/openssl/ssl/ssl3.h \
    src/crypto/dist/openssl/ssl/ssl_asn1.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/ssl/s2_lib.c \
    src/crypto/dist/openssl/ssl/s3_lib.c \
    src/crypto/dist/openssl/ssl/ssl_sess.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/ssl/s3_clnt.c \
    src/crypto/dist/openssl/ssl/ssl_err.c \
    src/crypto/dist/openssl/ssl/ssltest.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/ssl/s3_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/ssl/ssl_cert.c \
    src/crypto/dist/openssl/ssl/ssl_locl.h
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/openssl/test/sha1hashes.txt \
    src/crypto/dist/openssl/test/sha1vectors.txt \
    src/crypto/dist/openssl/test/testfipsssl
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/util/mkdef.pl \
    src/crypto/dist/openssl/util/selftest.pl
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/util/pod2man.pl
cvs rdiff -r1.1.1.3 -r0 src/crypto/dist/openssl/util/pl/BC-16.pl \
    src/crypto/dist/openssl/util/pl/VC-16.pl
cvs rdiff -r1.1.1.2 -r0 src/crypto/dist/openssl/util/pl/VC-CE.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.