Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/1ea82dd68741
branches: trunk
changeset: 997558:1ea82dd68741
user: christos <christos%NetBSD.org@localhost>
date: Tue Mar 12 16:58:12 2019 +0000
description:
merge conflicts
diffstat:
crypto/external/bsd/openssl/dist/.gitattributes | 3 -
crypto/external/bsd/openssl/dist/.github/PULL_REQUEST_TEMPLATE.md | 14 -
crypto/external/bsd/openssl/dist/.gitignore | 185 ------
crypto/external/bsd/openssl/dist/.gitmodules | 11 -
crypto/external/bsd/openssl/dist/.travis-apt-pin.preferences | 15 -
crypto/external/bsd/openssl/dist/.travis-create-release.sh | 11 -
crypto/external/bsd/openssl/dist/.travis.yml | 254 ---------
crypto/external/bsd/openssl/dist/CHANGES | 38 +
crypto/external/bsd/openssl/dist/Configurations/dist.conf | 12 -
crypto/external/bsd/openssl/dist/Configure | 11 +-
crypto/external/bsd/openssl/dist/NEWS | 7 +
crypto/external/bsd/openssl/dist/README | 2 +-
crypto/external/bsd/openssl/dist/apps/ocsp.c | 34 +-
crypto/external/bsd/openssl/dist/apps/openssl.cnf | 4 +-
crypto/external/bsd/openssl/dist/apps/s_client.c | 96 +++-
crypto/external/bsd/openssl/dist/apps/s_server.c | 23 +-
crypto/external/bsd/openssl/dist/apps/speed.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-x86_64.pl | 20 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86_64.pl | 18 +-
crypto/external/bsd/openssl/dist/crypto/armcap.c | 80 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl | 6 +
crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c | 68 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c | 66 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c | 1 +
crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/cryptlib.c | 18 +-
crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c | 7 +
crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h | 14 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_mont.c | 51 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nist.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c | 51 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c | 277 +++++++--
crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c | 45 +-
crypto/external/bsd/openssl/dist/crypto/ppccap.c | 76 ++-
crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl | 115 +++-
crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c | 23 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c | 82 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c | 95 +-
crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/uid.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 11 +-
crypto/external/bsd/openssl/dist/e_os.h | 3 +
crypto/external/bsd/openssl/dist/include/internal/tsan_assist.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/safestack.h | 85 ++-
crypto/external/bsd/openssl/dist/ssl/s3_enc.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/s3_lib.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl_err.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 46 +-
crypto/external/bsd/openssl/dist/ssl/ssl_locl.h | 6 +-
crypto/external/bsd/openssl/dist/ssl/t1_enc.c | 14 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 21 +-
crypto/external/bsd/openssl/dist/test/bntest.c | 186 +++++-
crypto/external/bsd/openssl/dist/test/ecdsatest.c | 8 +-
crypto/external/bsd/openssl/dist/test/evp_extra_test.c | 51 +-
crypto/external/bsd/openssl/dist/test/evp_test.c | 21 +-
crypto/external/bsd/openssl/dist/test/testutil/main.c | 4 +-
61 files changed, 1406 insertions(+), 975 deletions(-)
diffs (truncated from 4614 to 300 lines):
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.gitattributes
--- a/crypto/external/bsd/openssl/dist/.gitattributes Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-*.der binary
-/fuzz/corpora/** binary
-*.pfx binary
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.github/PULL_REQUEST_TEMPLATE.md
--- a/crypto/external/bsd/openssl/dist/.github/PULL_REQUEST_TEMPLATE.md Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<!--
-Thank you for your pull request. Please review these requirements:
-
-Contributors guide: https://github.com/openssl/openssl/blob/master/CONTRIBUTING
-
-Other than that, provide a description above this comment if there isn't one already
-
-If this fixes a github issue, make sure to have a line saying 'Fixes #XXXX' (without quotes) in the commit message.
--->
-
-##### Checklist
-<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
-- [ ] documentation is added or updated
-- [ ] tests are added or updated
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.gitignore
--- a/crypto/external/bsd/openssl/dist/.gitignore Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-# Ignore editor artefacts
-/.dir-locals.el
-
-# Top level excludes
-/Makefile.orig
-/MINFO
-/TABLE
-/*.pc
-/rehash.time
-/inc.*
-/makefile.*
-/out.*
-/tmp.*
-/configdata.pm
-
-# *all* Makefiles
-Makefile
-# ... except in demos
-!/demos/*/Makefile
-
-# Links under apps
-/apps/CA.pl
-/apps/tsget
-/apps/tsget.pl
-/apps/md4.c
-
-# Auto generated headers
-/crypto/buildinf.h
-/apps/progs.h
-/crypto/include/internal/*_conf.h
-/openssl/include/opensslconf.h
-/util/domd
-
-# error code files
-/crypto/err/openssl.txt.old
-/engines/e_afalg.txt.old
-/engines/e_capi.txt.old
-/engines/e_dasync.txt.old
-/engines/e_ossltest.txt.old
-
-# Executables
-/apps/openssl
-/test/sha256t
-/test/sha512t
-/test/gost2814789t
-/test/ssltest_old
-/test/*test
-/test/fips_aesavs
-/test/fips_desmovs
-/test/fips_dhvs
-/test/fips_drbgvs
-/test/fips_dssvs
-/test/fips_ecdhvs
-/test/fips_ecdsavs
-/test/fips_rngvs
-/test/fips_test_suite
-/test/ssltest_old
-/test/x509aux
-/test/v3ext
-/test/versions
-/test/ossl_shim/ossl_shim
-/test/rsa_complex
-
-# Certain files that get created by tests on the fly
-/test/test-runs
-/test/buildtest_*
-
-# Fuzz stuff.
-# Anything without an extension is an executable on Unix, so we keep files
-# with extensions. And we keep the corpora subddir versioned as well.
-# Anything more generic with extensions that should be ignored will be taken
-# care of by general ignores for those extensions (*.o, *.obj, *.exe, ...)
-/fuzz/*
-!/fuzz/README*
-!/fuzz/corpora
-!/fuzz/*.*
-
-# Misc auto generated files
-/include/openssl/opensslconf.h
-/tools/c_rehash
-/tools/c_rehash.pl
-/util/shlib_wrap.sh
-/tags
-/TAGS
-/libcrypto.map
-/libssl.map
-
-# Windows (legacy)
-/tmp32
-/tmp32.dbg
-/tmp32dll
-/tmp32dll.dbg
-/out32
-/out32.dbg
-/out32dll
-/out32dll.dbg
-/inc32
-/MINFO
-/ms/.rnd
-/ms/bcb.mak
-/ms/libeay32.def
-/ms/nt.mak
-/ms/ntdll.mak
-/ms/ssleay32.def
-/ms/version32.rc
-
-# Files created on other branches that are not held in git, and are not
-# needed on this branch
-/include/openssl/asn1_mac.h
-/include/openssl/des_old.h
-/include/openssl/fips.h
-/include/openssl/fips_rand.h
-/include/openssl/krb5_asn.h
-/include/openssl/kssl.h
-/include/openssl/pq_compat.h
-/include/openssl/ssl23.h
-/include/openssl/tmdiff.h
-/include/openssl/ui_compat.h
-/test/fips_aesavs.c
-/test/fips_desmovs.c
-/test/fips_dsatest.c
-/test/fips_dssvs.c
-/test/fips_hmactest.c
-/test/fips_randtest.c
-/test/fips_rngvs.c
-/test/fips_rsagtest.c
-/test/fips_rsastest.c
-/test/fips_rsavtest.c
-/test/fips_shatest.c
-/test/fips_test_suite.c
-/test/shatest.c
-
-##### Generic patterns
-# Auto generated assembly language source files
-*.s
-!/crypto/*/asm/*.s
-/crypto/arm*.S
-/crypto/*/*.S
-*.asm
-!/crypto/*/asm/*.asm
-
-# Object files
-*.o
-*.obj
-
-# editor artefacts
-*.swp
-.#*
-\#*#
-*~
-
-# Certificate symbolic links
-*.0
-
-# All kinds of libraries and executables
-*.a
-*.so
-*.so.*
-*.dylib
-*.dylib.*
-*.dll
-*.dll.*
-*.exe
-*.pyc
-*.exp
-*.lib
-*.pdb
-*.ilk
-*.def
-*.rc
-*.res
-
-# Misc generated stuff
-Makefile.save
-/crypto/**/lib
-/engines/**/lib
-/ssl/**/lib
-*.bak
-cscope.*
-*.d
-pod2htmd.tmp
-
-# Windows manifest files
-*.manifest
-doc-nits
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.gitmodules
--- a/crypto/external/bsd/openssl/dist/.gitmodules Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[submodule "boringssl"]
- path = boringssl
- url = https://boringssl.googlesource.com/boringssl
-
-[submodule "pyca.cryptography"]
- path = pyca-cryptography
- url = https://github.com/pyca/cryptography.git
-
-[submodule "krb5"]
- path = krb5
- url = https://github.com/krb5/krb5
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.travis-apt-pin.preferences
--- a/crypto/external/bsd/openssl/dist/.travis-apt-pin.preferences Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Package: clang-3.9
-Pin: release o=Ubuntu
-Pin-Priority: -1
-
-Package: libclang-common-3.9-dev
-Pin: release o=Ubuntu
-Pin-Priority: -1
-
-Package: libclang1-3.9
-Pin: release o=Ubuntu
-Pin-Priority: -1
-
-Package: libllvm3.9v4
-Pin: release o=Ubuntu
-Pin-Priority: -1
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.travis-create-release.sh
--- a/crypto/external/bsd/openssl/dist/.travis-create-release.sh Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-# $1 is expected to be $TRAVIS_OS_NAME
-
-./Configure dist
-if [ "$1" == osx ]; then
- make NAME='_srcdist' TARFILE='_srcdist.tar' \
- TAR_COMMAND='$(TAR) $(TARFLAGS) -cf -' tar
-else
- make TARFILE='_srcdist.tar' NAME='_srcdist' dist
-fi
diff -r 1c12b0657432 -r 1ea82dd68741 crypto/external/bsd/openssl/dist/.travis.yml
--- a/crypto/external/bsd/openssl/dist/.travis.yml Tue Mar 12 16:50:35 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-dist: trusty
-sudo: required
-
-osx_image: xcode9.3
-
-language: c
-cache: ccache
-git:
- submodules: false
- quiet: true
-
-before_install:
- - if [ -n "$COVERALLS" ]; then
- pip install --user cpp-coveralls;
- fi;
- - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then
- git submodule update --init --recursive;
- fi;
-
-os:
- - linux
- - osx
-
-compiler:
- - clang
- - gcc
-
-env:
- - CONFIG_OPTS="" DESTDIR="_install"
- - CONFIG_OPTS="no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2"
- - CONFIG_OPTS="no-asm no-makedepend --strict-warnings -std=c89 -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes"
-
-matrix:
Home |
Main Index |
Thread Index |
Old Index