Module Name:	src
Committed By:	christos
Date:		Sat Apr 23 19:31:15 UTC 2005

Modified Files:
	src/crypto/dist/openssl: CHANGES FAQ
	src/crypto/dist/openssl/crypto: cryptlib.c
	src/crypto/dist/openssl/crypto/asn1: asn1.h
	src/crypto/dist/openssl/crypto/x509: x509.h x509_txt.c x509_vfy.c
	    x509_vfy.h
	src/crypto/dist/openssl/crypto/x509v3: v3_purp.c
	src/crypto/dist/openssl/doc/crypto: EVP_EncryptInit.pod
	    EVP_SealInit.pod
	src/crypto/dist/openssl/doc/ssl: SSL_get_error.pod ssl.pod
	src/crypto/dist/openssl/ssl: s2_lib.c s3_lib.c s3_srvr.c ssl.h
	    ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_locl.h ssl_sess.c
	    ssltest.c

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 src/crypto/dist/openssl/CHANGES
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/FAQ
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/cryptlib.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/crypto/asn1/asn1.h
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/crypto/x509/x509.h \
    src/crypto/dist/openssl/crypto/x509/x509_vfy.h
cvs rdiff -r1.5 -r1.6 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_purp.c
cvs rdiff -r1.4 -r1.5 src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod
cvs rdiff -r1.3 -r1.4 src/crypto/dist/openssl/doc/crypto/EVP_SealInit.pod
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/doc/ssl/SSL_get_error.pod \
    src/crypto/dist/openssl/doc/ssl/ssl.pod
cvs rdiff -r1.7 -r1.8 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.9 -r1.10 src/crypto/dist/openssl/ssl/s3_srvr.c \
    src/crypto/dist/openssl/ssl/ssl_ciph.c
cvs rdiff -r1.11 -r1.12 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -r1.5 -r1.6 src/crypto/dist/openssl/ssl/ssl_asn1.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/openssl/ssl/ssl_cert.c \
    src/crypto/dist/openssl/ssl/ssl_locl.h
cvs rdiff -r1.6 -r1.7 src/crypto/dist/openssl/ssl/ssl_err.c \
    src/crypto/dist/openssl/ssl/ssltest.c

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