CVS commit: src

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    src
Committed By:   spz
Date:           Sun Jun  5 23:09:51 UTC 2011

Modified Files:
        src/crypto/external/bsd/openssl/dist/apps: speed.c
        src/crypto/external/bsd/openssl/dist/crypto: crypto.h md32_common.h
            opensslv.h
        src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bss_file.c
            bss_log.c
        src/crypto/external/bsd/openssl/dist/crypto/bn: bn_mont.c
        src/crypto/external/bsd/openssl/dist/crypto/cast: cast.h
        src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
        src/crypto/external/bsd/openssl/dist/crypto/des: des.h
        src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
        src/crypto/external/bsd/openssl/dist/crypto/engine: Makefile
            eng_aesni.c eng_all.c eng_cryptodev.c engine.h
        src/crypto/external/bsd/openssl/dist/crypto/evp: m_sha1.c
        src/crypto/external/bsd/openssl/dist/crypto/idea: i_skey.c idea.h
        src/crypto/external/bsd/openssl/dist/crypto/md4: md4.h md4_dgst.c
        src/crypto/external/bsd/openssl/dist/crypto/md5: md5.h md5_dgst.c
        src/crypto/external/bsd/openssl/dist/crypto/rand: randfile.c
        src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2.h
        src/crypto/external/bsd/openssl/dist/crypto/rc5: rc5_locl.h
        src/crypto/external/bsd/openssl/dist/crypto/ripemd: ripemd.h rmd_dgst.c
        src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_eay.c
        src/crypto/external/bsd/openssl/dist/crypto/sha: sha.h sha256.c
            sha_locl.h
        src/crypto/external/bsd/openssl/dist/doc/apps: tsget.pod
        src/crypto/external/bsd/openssl/dist/ssl: s23_clnt.c s3_clnt.c s3_enc.c
            s3_lib.c s3_pkt.c s3_srvr.c ssl_ciph.c ssl_locl.h ssltest.c
            t1_enc.c t1_lib.c
        src/crypto/external/bsd/openssl/lib/libcrypto: cms.inc engine.inc
            shlib_version
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: Makefile
            aes-586.S bn-586.S co-586.S des-586.S md5-586.S rmd-586.S x86.S
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: Makefile
            aes-ppc.S ppc.S ppccpuid.S sha1-ppc.S sha512-ppc.S
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
            aes-sparcv9.S sha1-sparcv9.S sha512-sparcv9.S
        src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile
            aes-x86_64.S md5-x86_64.S rc4-x86_64.S sha1-x86_64.S
            sha512-x86_64.S wp-x86_64.S
        src/crypto/external/bsd/openssl/lib/libssl: shlib_version
        src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
            md.sparc64 shl.mi
Added Files:
        src/crypto/external/bsd/openssl/lib/libcrypto: cmac.inc srp.inc
Removed Files:
        src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c

Log Message:
merge
It builds, which is an improvement to before. It may not work.
AES-NI is disabled and needs to be retrofitted yet


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/crypto/crypto.h \
    src/crypto/external/bsd/openssl/dist/crypto/md32_common.h \
    src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.3 -r1.4 \
    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/bio/bss_log.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/cast/cast.h
cvs rdiff -u -r1.1.1.1 -r0 \
    src/crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/des/des.h
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/Makefile \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c \
    src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/idea/i_skey.c \
    src/crypto/external/bsd/openssl/dist/crypto/idea/idea.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/md4/md4.h \
    src/crypto/external/bsd/openssl/dist/crypto/md4/md4_dgst.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/md5/md5.h \
    src/crypto/external/bsd/openssl/dist/crypto/md5/md5_dgst.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/rand/randfile.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5_locl.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/ripemd/ripemd.h \
    src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_dgst.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_eay.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c \
    src/crypto/external/bsd/openssl/dist/crypto/sha/sha_locl.h
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/doc/apps/tsget.pod
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c \
    src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h \
    src/crypto/external/bsd/openssl/dist/ssl/ssltest.c \
    src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.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_lib.c \
    src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/cmac.inc \
    src/crypto/external/bsd/openssl/lib/libcrypto/srp.inc
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/lib/libcrypto/cms.inc
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/Makefile \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/bn-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/co-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/des-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/md5-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/rmd-586.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/x86.S
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppc.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha1-ppc.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/aes-sparcv9.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha1-sparcv9.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/md5-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S \
    src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/lib/libssl/shlib_version
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.585 -r1.586 src/distrib/sets/lists/base/shl.mi

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