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

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

Module Name:    src
Committed By:   christos
Date:           Wed Aug  5 18:38:22 UTC 2009

Modified Files:
        src/crypto/external/bsd/openssl/dist/apps: ca.c
        src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
        src/crypto/external/bsd/openssl/dist/crypto/engine: eng_cryptodev.c
        src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.h
        src/crypto/external/bsd/openssl/dist/ssl: s3_pkt.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/ca.c
cvs rdiff -u -r1.2 -r1.3 \
    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/engine/eng_cryptodev.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c

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