Module Name:	src
Committed By:	jmc
Date:		Thu Apr  1 15:50:31 UTC 2004

Modified Files:
	src/crypto/dist/openssl/apps [netbsd-1-6]: asn1pars.c
	src/crypto/dist/openssl/certs [netbsd-1-6]: vsign3.pem
	src/crypto/dist/openssl/crypto/asn1 [netbsd-1-6]: a_strex.c
	src/crypto/dist/openssl/crypto/bio [netbsd-1-6]: b_print.c
	src/crypto/dist/openssl/crypto/evp [netbsd-1-6]: e_rc4.c
	src/crypto/dist/openssl/crypto/pem [netbsd-1-6]: pem_lib.c
	src/crypto/dist/openssl/crypto/x509 [netbsd-1-6]: by_dir.c x509type.c
	src/crypto/dist/openssl/doc/crypto [netbsd-1-6]: BIO_f_ssl.pod
	src/crypto/dist/openssl/doc/ssl [netbsd-1-6]:
	    SSL_COMP_add_compression_method.pod
	src/crypto/dist/openssl/ssl [netbsd-1-6]: s3_clnt.c s3_enc.c s3_pkt.c
	    ssl.h ssl_cert.c ssl_ciph.c

Log Message:
Pulled up via patch (requested by groo in ticket #1640)
Pull up major differences from openssl 0.9.6l->0.9.6m. Major fix is
a null pointer check that can cause crashes.


To generate a diff of this commit:
cvs rdiff -r1.1.1.3.2.1 -r1.1.1.3.2.2 src/crypto/dist/openssl/apps/asn1pars.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 src/crypto/dist/openssl/certs/vsign3.pem
cvs rdiff -r1.1.1.1 -r1.1.1.1.2.1 \
    src/crypto/dist/openssl/crypto/asn1/a_strex.c
cvs rdiff -r1.1.1.4.2.2 -r1.1.1.4.2.3 \
    src/crypto/dist/openssl/crypto/bio/b_print.c
cvs rdiff -r1.1.1.2 -r1.1.1.2.2.1 src/crypto/dist/openssl/crypto/evp/e_rc4.c
cvs rdiff -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
    src/crypto/dist/openssl/crypto/pem/pem_lib.c
cvs rdiff -r1.1.1.3 -r1.1.1.3.2.1 \
    src/crypto/dist/openssl/crypto/x509/by_dir.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.6.1 \
    src/crypto/dist/openssl/crypto/x509/x509type.c
cvs rdiff -r1.1.1.1 -r1.1.1.1.2.1 \
    src/crypto/dist/openssl/doc/crypto/BIO_f_ssl.pod
cvs rdiff -r1.1.2.1 -r1.1.2.2 \
    src/crypto/dist/openssl/doc/ssl/SSL_COMP_add_compression_method.pod
cvs rdiff -r1.1.1.3.2.3 -r1.1.1.3.2.4 src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -r1.1.1.4.2.1 -r1.1.1.4.2.2 src/crypto/dist/openssl/ssl/s3_enc.c
cvs rdiff -r1.1.1.3.2.2 -r1.1.1.3.2.3 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -r1.3.2.2 -r1.3.2.3 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.3.2.1 -r1.3.2.2 src/crypto/dist/openssl/ssl/ssl_cert.c
cvs rdiff -r1.3.2.3 -r1.3.2.4 src/crypto/dist/openssl/ssl/ssl_ciph.c

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