Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 337f6b3

Browse files
shigekirvagg
authored andcommittedAug 15, 2018
deps: upgrade openssl sources to 1.1.0i
This updates all sources in deps/openssl/openssl with openssl-1.1.0i. PR-URL: #22318 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent fbc45d4 commit 337f6b3

File tree

406 files changed

+6034
-2897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+6034
-2897
lines changed
 

‎deps/openssl/openssl/.gitignore

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
# Ignore editor artefacts
2+
/.dir-locals.el
3+
4+
# Top level excludes
5+
/Makefile.orig
6+
/MINFO
7+
/TABLE
8+
/*.a
9+
/*.pc
10+
/rehash.time
11+
/inc.*
12+
/makefile.*
13+
/out.*
14+
/tmp.*
15+
/configdata.pm
16+
17+
# *all* Makefiles
18+
Makefile
19+
# ... except in demos
20+
!/demos/*/Makefile
21+
22+
# Links under apps
23+
/apps/CA.pl
24+
/apps/tsget
25+
/apps/tsget.pl
26+
/apps/md4.c
27+
28+
# Auto generated headers
29+
/crypto/buildinf.h
30+
/apps/progs.h
31+
/crypto/include/internal/*_conf.h
32+
/openssl/include/opensslconf.h
33+
/util/domd
34+
35+
# Executables
36+
/apps/openssl
37+
/test/sha256t
38+
/test/sha512t
39+
/test/gost2814789t
40+
/test/ssltest_old
41+
/test/*test
42+
/test/fips_aesavs
43+
/test/fips_desmovs
44+
/test/fips_dhvs
45+
/test/fips_drbgvs
46+
/test/fips_dssvs
47+
/test/fips_ecdhvs
48+
/test/fips_ecdsavs
49+
/test/fips_rngvs
50+
/test/fips_test_suite
51+
/test/ssltest_old
52+
/test/x509aux
53+
/test/v3ext
54+
/test/versions
55+
56+
# Certain files that get created by tests on the fly
57+
/test/test-runs
58+
/test/buildtest_*
59+
60+
# Fuzz stuff.
61+
# Anything without an extension is an executable on Unix, so we keep files
62+
# with extensions. And we keep the corpora subddir versioned as well.
63+
# Anything more generic with extensions that should be ignored will be taken
64+
# care of by general ignores for those extensions (*.o, *.obj, *.exe, ...)
65+
/fuzz/*
66+
!/fuzz/README*
67+
!/fuzz/corpora
68+
!/fuzz/*.*
69+
70+
# Misc auto generated files
71+
/include/openssl/opensslconf.h
72+
/tools/c_rehash
73+
/tools/c_rehash.pl
74+
/util/shlib_wrap.sh
75+
/tags
76+
/TAGS
77+
/crypto.map
78+
/ssl.map
79+
80+
# Windows (legacy)
81+
/tmp32
82+
/tmp32.dbg
83+
/tmp32dll
84+
/tmp32dll.dbg
85+
/out32
86+
/out32.dbg
87+
/out32dll
88+
/out32dll.dbg
89+
/inc32
90+
/MINFO
91+
/ms/.rnd
92+
/ms/bcb.mak
93+
/ms/libeay32.def
94+
/ms/nt.mak
95+
/ms/ntdll.mak
96+
/ms/ssleay32.def
97+
/ms/version32.rc
98+
99+
# Files created on other branches that are not held in git, and are not
100+
# needed on this branch
101+
/include/openssl/asn1_mac.h
102+
/include/openssl/des_old.h
103+
/include/openssl/fips.h
104+
/include/openssl/fips_rand.h
105+
/include/openssl/krb5_asn.h
106+
/include/openssl/kssl.h
107+
/include/openssl/pq_compat.h
108+
/include/openssl/ssl23.h
109+
/include/openssl/tmdiff.h
110+
/include/openssl/ui_compat.h
111+
/test/fips_aesavs.c
112+
/test/fips_desmovs.c
113+
/test/fips_dsatest.c
114+
/test/fips_dssvs.c
115+
/test/fips_hmactest.c
116+
/test/fips_randtest.c
117+
/test/fips_rngvs.c
118+
/test/fips_rsagtest.c
119+
/test/fips_rsastest.c
120+
/test/fips_rsavtest.c
121+
/test/fips_shatest.c
122+
/test/fips_test_suite.c
123+
/test/shatest.c
124+
125+
##### Generic patterns
126+
# Auto generated assembly language source files
127+
*.s
128+
!/crypto/*/asm/*.s
129+
/crypto/arm*.S
130+
/crypto/*/*.S
131+
*.asm
132+
!/crypto/*/asm/*.asm
133+
134+
# Object files
135+
*.o
136+
*.obj
137+
138+
# editor artefacts
139+
*.swp
140+
.#*
141+
\#*#
142+
*~
143+
144+
# Certificate symbolic links
145+
*.0
146+
147+
# All kinds of executables
148+
*.so
149+
*.so.*
150+
*.dylib
151+
*.dylib.*
152+
*.dll
153+
*.dll.*
154+
*.exe
155+
*.pyc
156+
*.exp
157+
*.lib
158+
*.pdb
159+
*.ilk
160+
*.def
161+
*.rc
162+
*.res
163+
164+
# Misc generated stuff
165+
Makefile.save
166+
/crypto/**/lib
167+
/engines/**/lib
168+
/ssl/**/lib
169+
*.bak
170+
cscope.*
171+
*.d
172+
pod2htmd.tmp
173+
174+
# Windows manifest files
175+
*.manifest

‎deps/openssl/openssl/.travis.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ matrix:
6161
sources:
6262
- ubuntu-toolchain-r-test
6363
compiler: gcc-5
64-
env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
64+
env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
6565
- os: linux
6666
addons:
6767
apt:
6868
packages:
6969
- binutils-mingw-w64
7070
- gcc-mingw-w64
7171
compiler: i686-w64-mingw32-gcc
72-
env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz"
72+
env: CONFIG_OPTS="no-pic"
7373
- os: linux
7474
addons:
7575
apt:
@@ -85,7 +85,7 @@ matrix:
8585
- binutils-mingw-w64
8686
- gcc-mingw-w64
8787
compiler: x86_64-w64-mingw32-gcc
88-
env: CONFIG_OPTS="no-pic" TESTS="-test_fuzz"
88+
env: CONFIG_OPTS="no-pic"
8989
- os: linux
9090
addons:
9191
apt:
@@ -112,6 +112,10 @@ before_script:
112112
srcdir=.;
113113
top=.;
114114
fi
115+
- if [ -n "$UBUNTU_GCC_HACK" ]; then
116+
$CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt;
117+
CC="$CC -specs=gcc-specs.txt";
118+
fi
115119
- if [ "$CC" == i686-w64-mingw32-gcc ]; then
116120
export CROSS_COMPILE=${CC%%gcc}; unset CC;
117121
$srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
@@ -186,7 +190,7 @@ script:
186190
fi
187191
- if [ -n "$DESTDIR" ]; then
188192
mkdir "../$DESTDIR";
189-
if $make install install_docs DESTDIR="../$DESTDIR"; then
193+
if $make install DESTDIR="../$DESTDIR"; then
190194
echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS OK';
191195
else
192196
echo -e '+\057\057\057\057\057 MAKE INSTALL_DOCS FAILED'; false;

0 commit comments

Comments
 (0)