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

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

Module Name:    src
Committed By:   christos
Date:           Sun Dec  6 21:52:37 UTC 2015

Modified Files:
        src/crypto/external/bsd/openssl/dist: CHANGES Configure Makefile NEWS
            README e_os.h openssl.spec
        src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c s_client.c
            s_server.c
        src/crypto/external/bsd/openssl/dist/crypto: cryptlib.c mem_clr.c
            opensslconf.h opensslv.h sparccpuid.S
        src/crypto/external/bsd/openssl/dist/crypto/asn1: tasn_dec.c
        src/crypto/external/bsd/openssl/dist/crypto/bio: bss_file.c
        src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_mont.c
            bntest.c
        src/crypto/external/bsd/openssl/dist/crypto/bn/asm: x86_64-gcc.c
            x86_64-gf2m.pl
        src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c
        src/crypto/external/bsd/openssl/dist/crypto/comp: c_zlib.c
        src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
        src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c
        src/crypto/external/bsd/openssl/dist/crypto/ec: ec.h ec_asn1.c
        src/crypto/external/bsd/openssl/dist/crypto/engine: eng_cryptodev.c
        src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c
        src/crypto/external/bsd/openssl/dist/crypto/rc4/asm: rc4-x86_64.pl
        src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_sign.c
        src/crypto/external/bsd/openssl/dist/doc/apps: dgst.pod
        src/crypto/external/bsd/openssl/dist/doc/crypto:
            EVP_DigestVerifyInit.pod
        src/crypto/external/bsd/openssl/dist/ssl: Makefile d1_both.c d1_srvr.c
            s23_clnt.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_srvr.c ssl.h
            ssl3.h ssl_ciph.c ssl_err.c ssl_lib.c ssl_locl.h ssltest.c t1_enc.c
            t1_lib.c tls1.h
        src/crypto/external/bsd/openssl/dist/test: Makefile
        src/crypto/external/bsd/openssl/dist/util: mk1mf.pl
Removed Files:
        src/crypto/external/bsd/openssl/dist/crypto/des/t: test

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/CHANGES \
    src/crypto/external/bsd/openssl/dist/NEWS \
    src/crypto/external/bsd/openssl/dist/README \
    src/crypto/external/bsd/openssl/dist/openssl.spec
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/e_os.h
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/apps/ca.c \
    src/crypto/external/bsd/openssl/dist/apps/s_client.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \
    src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/mem_clr.c
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
cvs rdiff -u -r1.16 -r1.17 \
    src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.8 -r1.9 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bntest.c
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/crypto/external/bsd/openssl/dist/crypto/des/t/test
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/crypto/ec/ec.h
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c
cvs rdiff -u -r1.7 -r1.8 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/crypto/rc4/asm/rc4-x86_64.pl
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/doc/apps/dgst.pod
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/doc/crypto/EVP_DigestVerifyInit.pod
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/ssl/Makefile \
    src/crypto/external/bsd/openssl/dist/ssl/tls1.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/ssl/d1_both.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/ssl/d1_srvr.c \
    src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl3.h \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssltest.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/s3_cbc.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c \
    src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/ssl/ssl.h
cvs rdiff -u -r1.11 -r1.12 \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/test/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/util/mk1mf.pl

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