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

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

Module Name:    src
Committed By:   christos
Date:           Tue Mar 12 16:58:14 UTC 2019

Modified Files:
        src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README
            e_os.h
        src/crypto/external/bsd/openssl/dist/apps: ocsp.c openssl.cnf
            s_client.c s_server.c speed.c
        src/crypto/external/bsd/openssl/dist/crypto: armcap.c cryptlib.c
            ppccap.c ppccpuid.pl uid.c
        src/crypto/external/bsd/openssl/dist/crypto/aes/asm: aes-x86_64.pl
            aesni-x86_64.pl
        src/crypto/external/bsd/openssl/dist/crypto/bio: bss_file.c
        src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c
        src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl
        src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c
        src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
        src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
        src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c
            ec_lcl.h ecp_mont.c ecp_nist.c ecp_smpl.c
        src/crypto/external/bsd/openssl/dist/crypto/engine: eng_devcrypto.c
            eng_lib.c
        src/crypto/external/bsd/openssl/dist/crypto/evp: evp_enc.c
        src/crypto/external/bsd/openssl/dist/crypto/rand: rand_unix.c
        src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_oaep.c rsa_pk1.c
        src/crypto/external/bsd/openssl/dist/crypto/ui: ui_openssl.c
        src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
        src/crypto/external/bsd/openssl/dist/include/internal: tsan_assist.h
        src/crypto/external/bsd/openssl/dist/include/openssl: safestack.h
        src/crypto/external/bsd/openssl/dist/ssl: s3_enc.c s3_lib.c ssl_ciph.c
            ssl_err.c ssl_lib.c ssl_locl.h t1_enc.c t1_lib.c
        src/crypto/external/bsd/openssl/dist/test: bntest.c ecdsatest.c
            evp_extra_test.c evp_test.c
        src/crypto/external/bsd/openssl/dist/test/testutil: main.c
Removed Files:
        src/crypto/external/bsd/openssl/dist: .gitattributes .gitignore
            .gitmodules .travis-apt-pin.preferences .travis-create-release.sh
            .travis.yml
        src/crypto/external/bsd/openssl/dist/.github: PULL_REQUEST_TEMPLATE.md
        src/crypto/external/bsd/openssl/dist/Configurations: dist.conf

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
    src/crypto/external/bsd/openssl/dist/.gitattributes \
    src/crypto/external/bsd/openssl/dist/.gitmodules \
    src/crypto/external/bsd/openssl/dist/.travis-apt-pin.preferences
cvs rdiff -u -r1.1.1.4 -r0 src/crypto/external/bsd/openssl/dist/.gitignore \
    src/crypto/external/bsd/openssl/dist/.travis.yml
cvs rdiff -u -r1.1.1.2 -r0 \
    src/crypto/external/bsd/openssl/dist/.travis-create-release.sh
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/CHANGES \
    src/crypto/external/bsd/openssl/dist/NEWS \
    src/crypto/external/bsd/openssl/dist/README
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/e_os.h
cvs rdiff -u -r1.1.1.1 -r0 \
    src/crypto/external/bsd/openssl/dist/.github/PULL_REQUEST_TEMPLATE.md
cvs rdiff -u -r1.1.1.2 -r0 \
    src/crypto/external/bsd/openssl/dist/Configurations/dist.conf
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \
    src/crypto/external/bsd/openssl/dist/apps/s_client.c
cvs rdiff -u -r1.7 -r1.8 \
    src/crypto/external/bsd/openssl/dist/apps/openssl.cnf
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/crypto/armcap.c
cvs rdiff -u -r1.13 -r1.14 \
    src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c
cvs rdiff -u -r1.9 -r1.10 \
    src/crypto/external/bsd/openssl/dist/crypto/ppccap.c
cvs rdiff -u -r1.7 -r1.8 \
    src/crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/crypto/uid.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-x86_64.pl \
    src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86_64.pl
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.18 -r1.19 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c
cvs rdiff -u -r1.9 -r1.10 \
    src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.13 -r1.14 \
    src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
cvs rdiff -u -r1.7 -r1.8 \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c
cvs rdiff -u -r1.8 -r1.9 \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_mont.c \
    src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_nist.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c
cvs rdiff -u -r1.9 -r1.10 \
    src/crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c
cvs rdiff -u -r1.10 -r1.11 \
    src/crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c
cvs rdiff -u -r1.8 -r1.9 \
    src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c
cvs rdiff -u -r1.6 -r1.7 \
    src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c
cvs rdiff -u -r1.13 -r1.14 \
    src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c
cvs rdiff -u -r1.15 -r1.16 \
    src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/include/internal/tsan_assist.h
cvs rdiff -u -r1.3 -r1.4 \
    src/crypto/external/bsd/openssl/dist/include/openssl/safestack.h
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.17 -r1.18 \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c
cvs rdiff -u -r1.20 -r1.21 \
    src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/bntest.c \
    src/crypto/external/bsd/openssl/dist/test/ecdsatest.c
cvs rdiff -u -r1.5 -r1.6 \
    src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c \
    src/crypto/external/bsd/openssl/dist/test/evp_test.c
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl/dist/test/testutil/main.c

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