Module Name:	src
Committed By:	mjf
Date:		Tue Mar  6 23:47:24 UTC 2007

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ
	src/crypto/dist/openssl/apps: ca.c dgst.c enc.c
	src/crypto/dist/openssl/crypto: cryptlib.c opensslconf.h opensslv.h
	src/crypto/dist/openssl/crypto/asn1: asn1_lib.c asn1t.h tasn_dec.c
	src/crypto/dist/openssl/crypto/bio: bio.h
	src/crypto/dist/openssl/crypto/bn: bn_lib.c bn_print.c
	src/crypto/dist/openssl/crypto/conf: conf_def.c
	src/crypto/dist/openssl/crypto/des: ecb_enc.c
	src/crypto/dist/openssl/crypto/dh: dh_err.c dh_key.c
	src/crypto/dist/openssl/crypto/dsa: dsa_err.c
	src/crypto/dist/openssl/crypto/engine: eng_all.c
	src/crypto/dist/openssl/crypto/evp: evp.h
	src/crypto/dist/openssl/crypto/idea: i_ecb.c idea_lcl.h
	src/crypto/dist/openssl/crypto/lhash: lhash.c
	src/crypto/dist/openssl/crypto/md2: md2.h
	src/crypto/dist/openssl/crypto/md4: md4.h md4_dgst.c
	src/crypto/dist/openssl/crypto/md5: md5.h md5_dgst.c
	src/crypto/dist/openssl/crypto/pem: pem.h pem_lib.c
	src/crypto/dist/openssl/crypto/pkcs7: pk7_doit.c pk7_smime.c
	src/crypto/dist/openssl/crypto/rand: md_rand.c
	src/crypto/dist/openssl/crypto/rc2: rc2_ecb.c
	src/crypto/dist/openssl/crypto/ripemd: ripemd.h rmd_dgst.c
	src/crypto/dist/openssl/crypto/rsa: rsa_err.c rsa_lib.c
	src/crypto/dist/openssl/crypto/sha: sha.h sha256.c
	src/crypto/dist/openssl/crypto/x509: by_dir.c x509.h x509_txt.c
	    x509_vfy.c x509_vfy.h
	src/crypto/dist/openssl/crypto/x509v3: v3_alt.c v3_info.c v3_purp.c
	src/crypto/dist/openssl/doc/apps: ciphers.pod s_client.pod x509.pod
	src/crypto/dist/openssl/doc/crypto: RAND_egd.pod
	    RSA_get_ex_new_index.pod md5.pod
	src/crypto/dist/openssl/ssl: s23_srvr.c s2_lib.c s3_clnt.c s3_lib.c
	    s3_pkt.c s3_srvr.c ssl.h ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c
	src/crypto/dist/openssl/util: mkdef.pl

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.15 -r1.16 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/apps/ca.c \
    src/crypto/dist/openssl/apps/dgst.c src/crypto/dist/openssl/apps/enc.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/cryptlib.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/opensslconf.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/opensslv.h
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/crypto/asn1/asn1_lib.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/asn1/asn1t.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/asn1/tasn_dec.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/crypto/bio/bio.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/bn/bn_lib.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/conf/conf_def.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/des/ecb_enc.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/dh/dh_err.c \
    src/crypto/dist/openssl/crypto/dh/dh_key.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/dsa/dsa_err.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/engine/eng_all.c
cvs rdiff -r1.12 -r1.13 src/crypto/dist/openssl/crypto/evp/evp.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/idea/i_ecb.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/idea/idea_lcl.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/lhash/lhash.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/md2/md2.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/md4/md4.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/md4/md4_dgst.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/md5/md5.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/md5/md5_dgst.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/pem/pem.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/pem/pem_lib.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/pkcs7/pk7_doit.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/pkcs7/pk7_smime.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/rand/md_rand.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/rc2/rc2_ecb.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/ripemd/ripemd.h
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/ripemd/rmd_dgst.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rsa/rsa_err.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/rsa/rsa_lib.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/sha/sha.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/sha/sha256.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/x509/by_dir.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/crypto/x509/x509.h \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.h
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/x509/x509_txt.c \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/x509v3/v3_alt.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/x509v3/v3_info.c \
    src/crypto/dist/openssl/crypto/x509v3/v3_purp.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/apps/ciphers.pod \
    src/crypto/dist/openssl/doc/apps/x509.pod
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/doc/apps/s_client.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/crypto/RAND_egd.pod
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/openssl/doc/crypto/RSA_get_ex_new_index.pod \
    src/crypto/dist/openssl/doc/crypto/md5.pod
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/ssl/s23_srvr.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/ssl/s2_lib.c \
    src/crypto/dist/openssl/ssl/ssl_sess.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/ssl/s3_clnt.c \
    src/crypto/dist/openssl/ssl/ssl_err.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/ssl/s3_lib.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -r1.13 -r1.14 src/crypto/dist/openssl/ssl/s3_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/ssl/ssl_lib.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/util/mkdef.pl

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