Module Name:	src
Committed By:	groo
Date:		Sat Mar 20 04:32:38 UTC 2004

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ
	src/crypto/dist/openssl/MacOS/GetHTTPS.src: CPStringUtils.cpp
	    ErrorHandling.cpp
	src/crypto/dist/openssl/apps: apps.h ca.c dgst.c enc.c req.c s_time.c
	    speed.c
	src/crypto/dist/openssl/crypto: cversion.c mem_dbg.c
	src/crypto/dist/openssl/crypto/asn1: a_gentm.c a_mbstr.c a_utctm.c
	    asn1_lib.c asn1_par.c t_pkey.c
	src/crypto/dist/openssl/crypto/bio: b_dump.c b_sock.c bio_cb.c
	    bss_conn.c bss_file.c
	src/crypto/dist/openssl/crypto/bn: bn_lib.c bn_print.c
	src/crypto/dist/openssl/crypto/conf: conf_def.c conf_mod.c
	src/crypto/dist/openssl/crypto/des: ecb_enc.c
	src/crypto/dist/openssl/crypto/engine: engine.h hw_cryptodev.c
	src/crypto/dist/openssl/crypto/err: err.c
	src/crypto/dist/openssl/crypto/evp: evp.h evp_pbe.c evp_pkey.c
	src/crypto/dist/openssl/crypto/objects: obj_dat.c
	src/crypto/dist/openssl/crypto/pem: pem_lib.c
	src/crypto/dist/openssl/crypto/rand: rand_egd.c randfile.c
	src/crypto/dist/openssl/crypto/threads: mttest.c
	src/crypto/dist/openssl/crypto/ui: ui_lib.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: ssleay.txt
	src/crypto/dist/openssl/doc/apps: openssl.pod s_client.pod smime.pod
	src/crypto/dist/openssl/doc/crypto: EVP_DigestInit.pod
	    OpenSSL_add_all_algorithms.pod RSA_print.pod des.pod
	src/crypto/dist/openssl/ssl: s2_clnt.c s2_lib.c s2_srvr.c s3_clnt.c
	    s3_lib.c s3_pkt.c s3_srvr.c ssl.h ssl_asn1.c ssl_cert.c ssl_ciph.c
	    ssl_sess.c ssltest.c
	src/crypto/dist/openssl/util: mkdef.pl

Log Message:
Resolve conflicts.  In particular, prefer OpenSSL's BIO_strl* and
BIO_strncpy over ours.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.1 -r1.2 \
    src/crypto/dist/openssl/MacOS/GetHTTPS.src/CPStringUtils.cpp \
    src/crypto/dist/openssl/MacOS/GetHTTPS.src/ErrorHandling.cpp
cvs rdiff -r1.4 -r1.5 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
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/apps/enc.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/apps/s_time.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/apps/speed.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/cversion.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/mem_dbg.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/asn1/a_gentm.c \
    src/crypto/dist/openssl/crypto/asn1/a_utctm.c \
    src/crypto/dist/openssl/crypto/asn1/asn1_par.c \
    src/crypto/dist/openssl/crypto/asn1/t_pkey.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/asn1/a_mbstr.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/asn1/asn1_lib.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/bio/b_dump.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/bio/b_sock.c \
    src/crypto/dist/openssl/crypto/bio/bio_cb.c \
    src/crypto/dist/openssl/crypto/bio/bss_conn.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/bio/bss_file.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/bn/bn_lib.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/conf/conf_def.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/conf/conf_mod.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/des/ecb_enc.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/engine/engine.h \
    src/crypto/dist/openssl/crypto/engine/hw_cryptodev.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/err/err.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/crypto/evp/evp.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/evp/evp_pbe.c \
    src/crypto/dist/openssl/crypto/evp/evp_pkey.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/objects/obj_dat.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/pem/pem_lib.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/rand/rand_egd.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/rand/randfile.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/crypto/threads/mttest.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/ui/ui_lib.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/openssl/crypto/x509/by_dir.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/crypto/x509/x509.h \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.h
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/x509/x509_txt.c \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/crypto/x509v3/v3_alt.c \
    src/crypto/dist/openssl/crypto/x509v3/v3_purp.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/x509v3/v3_info.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/ssleay.txt
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/apps/openssl.pod \
    src/crypto/dist/openssl/doc/apps/s_client.pod \
    src/crypto/dist/openssl/doc/apps/smime.pod
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod
cvs rdiff -r1.2 -r1.3 \
    src/crypto/dist/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/crypto/RSA_print.pod \
    src/crypto/dist/openssl/doc/crypto/des.pod
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/ssl/s2_clnt.c \
    src/crypto/dist/openssl/ssl/s2_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_asn1.c \
    src/crypto/dist/openssl/ssl/ssltest.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/ssl/s2_lib.c \
    src/crypto/dist/openssl/ssl/ssl_cert.c \
    src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/ssl/s3_clnt.c \
    src/crypto/dist/openssl/ssl/s3_lib.c \
    src/crypto/dist/openssl/ssl/ssl_sess.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/openssl/ssl/s3_srvr.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.3 -r1.4 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.