CVS commit: src/crypto/external/bsd/openssl

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Dec 27 00:48:56 UTC 2009

Modified Files:
        src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c speed.c
        src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bss_file.c
        src/crypto/external/bsd/openssl/dist/crypto/cast: cast.h
        src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
        src/crypto/external/bsd/openssl/dist/crypto/pkcs12: p12_decr.c
        src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c
        src/crypto/external/bsd/openssl/dist/ssl: s23_clnt.c s3_lib.c s3_pkt.c
            s3_srvr.c ssl_ciph.c
        src/crypto/external/bsd/openssl/lib/libcrypto: cms.inc shlib_version
        src/crypto/external/bsd/openssl/lib/libssl: shlib_version ssl.inc

Log Message:
merge conflicts and undo the session renegotiation disabling code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/ca.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \
    src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c \
    src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/cast/cast.h
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_decr.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c \
    src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/cms.inc
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/lib/libssl/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc

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