Skip to content

Commit c21b24d

Browse files
author
Shigeki Ohtsu
committed
deps: upgrade openssl sources to 1.0.2b
This just replaces all sources of openssl-1.0.2b.tar.gz into deps/openssl/openssl Fixes: #1921 PR-URL: #1950 Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent a6b8ee1 commit c21b24d

File tree

365 files changed

+4738
-1780
lines changed

Some content is hidden

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

365 files changed

+4738
-1780
lines changed

‎deps/openssl/openssl/CHANGES

+87-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,90 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.2a and 1.0.2b [11 Jun 2015]
6+
7+
*) Malformed ECParameters causes infinite loop
8+
9+
When processing an ECParameters structure OpenSSL enters an infinite loop
10+
if the curve specified is over a specially malformed binary polynomial
11+
field.
12+
13+
This can be used to perform denial of service against any
14+
system which processes public keys, certificate requests or
15+
certificates. This includes TLS clients and TLS servers with
16+
client authentication enabled.
17+
18+
This issue was reported to OpenSSL by Joseph Barr-Pixton.
19+
(CVE-2015-1788)
20+
[Andy Polyakov]
21+
22+
*) Exploitable out-of-bounds read in X509_cmp_time
23+
24+
X509_cmp_time does not properly check the length of the ASN1_TIME
25+
string and can read a few bytes out of bounds. In addition,
26+
X509_cmp_time accepts an arbitrary number of fractional seconds in the
27+
time string.
28+
29+
An attacker can use this to craft malformed certificates and CRLs of
30+
various sizes and potentially cause a segmentation fault, resulting in
31+
a DoS on applications that verify certificates or CRLs. TLS clients
32+
that verify CRLs are affected. TLS clients and servers with client
33+
authentication enabled may be affected if they use custom verification
34+
callbacks.
35+
36+
This issue was reported to OpenSSL by Robert Swiecki (Google), and
37+
independently by Hanno B�ck.
38+
(CVE-2015-1789)
39+
[Emilia K�sper]
40+
41+
*) PKCS7 crash with missing EnvelopedContent
42+
43+
The PKCS#7 parsing code does not handle missing inner EncryptedContent
44+
correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs
45+
with missing content and trigger a NULL pointer dereference on parsing.
46+
47+
Applications that decrypt PKCS#7 data or otherwise parse PKCS#7
48+
structures from untrusted sources are affected. OpenSSL clients and
49+
servers are not affected.
50+
51+
This issue was reported to OpenSSL by Michal Zalewski (Google).
52+
(CVE-2015-1790)
53+
[Emilia K�sper]
54+
55+
*) CMS verify infinite loop with unknown hash function
56+
57+
When verifying a signedData message the CMS code can enter an infinite loop
58+
if presented with an unknown hash function OID. This can be used to perform
59+
denial of service against any system which verifies signedData messages using
60+
the CMS code.
61+
This issue was reported to OpenSSL by Johannes Bauer.
62+
(CVE-2015-1792)
63+
[Stephen Henson]
64+
65+
*) Race condition handling NewSessionTicket
66+
67+
If a NewSessionTicket is received by a multi-threaded client when attempting to
68+
reuse a previous ticket then a race condition can occur potentially leading to
69+
a double free of the ticket data.
70+
(CVE-2015-1791)
71+
[Matt Caswell]
72+
73+
*) Removed support for the two export grade static DH ciphersuites
74+
EXP-DH-RSA-DES-CBC-SHA and EXP-DH-DSS-DES-CBC-SHA. These two ciphersuites
75+
were newly added (along with a number of other static DH ciphersuites) to
76+
1.0.2. However the two export ones have *never* worked since they were
77+
introduced. It seems strange in any case to be adding new export
78+
ciphersuites, and given "logjam" it also does not seem correct to fix them.
79+
[Matt Caswell]
80+
81+
*) Only support 256-bit or stronger elliptic curves with the
82+
'ecdh_auto' setting (server) or by default (client). Of supported
83+
curves, prefer P-256 (both).
84+
[Emilia Kasper]
85+
86+
*) Reject DH handshakes with parameters shorter than 768 bits.
87+
[Kurt Roeckx and Emilia Kasper]
88+
589
Changes between 1.0.2 and 1.0.2a [19 Mar 2015]
690

791
*) ClientHello sigalgs DoS fix
@@ -373,7 +457,7 @@
373457
[Steve Henson]
374458

375459
*) Add new "valid_flags" field to CERT_PKEY structure which determines what
376-
the certificate can be used for (if anything). Set valid_flags field
460+
the certificate can be used for (if anything). Set valid_flags field
377461
in new tls1_check_chain function. Simplify ssl_set_cert_masks which used
378462
to have similar checks in it.
379463

@@ -416,7 +500,7 @@
416500
*) Fix OCSP checking.
417501
[Rob Stradling <[email protected]> and Ben Laurie]
418502

419-
*) Initial experimental support for explicitly trusted non-root CAs.
503+
*) Initial experimental support for explicitly trusted non-root CAs.
420504
OpenSSL still tries to build a complete chain to a root but if an
421505
intermediate CA has a trust setting included that is used. The first
422506
setting is used: whether to trust (e.g., -addtrust option to the x509
@@ -467,7 +551,7 @@
467551
to set list of supported curves.
468552
[Steve Henson]
469553

470-
*) New ctrls to retrieve supported signature algorithms and
554+
*) New ctrls to retrieve supported signature algorithms and
471555
supported curve values as an array of NIDs. Extend openssl utility
472556
to print out received values.
473557
[Steve Henson]

‎deps/openssl/openssl/Configure

+36-9
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,24 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
105105

106106
my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
107107

108-
my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum";
108+
# TODO(openssl-team): fix problems and investigate if (at least) the following
109+
# warnings can also be enabled:
110+
# -Wconditional-uninitialized, -Wswitch-enum, -Wunused-macros,
111+
# -Wmissing-field-initializers, -Wmissing-variable-declarations,
112+
# -Wincompatible-pointer-types-discards-qualifiers, -Wcast-align,
113+
# -Wunreachable-code -Wunused-parameter -Wlanguage-extension-token
114+
# -Wextended-offsetof
115+
my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof";
116+
117+
# These are used in addition to $gcc_devteam_warn when the compiler is clang.
118+
# TODO(openssl-team): fix problems and investigate if (at least) the
119+
# following warnings can also be enabled: -Wconditional-uninitialized,
120+
# -Wswitch-enum, -Wunused-macros, -Wmissing-field-initializers,
121+
# -Wmissing-variable-declarations,
122+
# -Wincompatible-pointer-types-discards-qualifiers, -Wcast-align,
123+
# -Wunreachable-code -Wunused-parameter -Wlanguage-extension-token
124+
# -Wextended-offsetof
125+
my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments";
109126

110127
my $strict_warnings = 0;
111128

@@ -233,12 +250,12 @@ my %table=(
233250

234251
#### SPARC Solaris with GNU C setups
235252
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
236-
"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
253+
"solaris-sparcv8-gcc","gcc:-mcpu=v8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
237254
# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
238255
"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
239256
"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
240257
####
241-
"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
258+
"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=v8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
242259
"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
243260

244261
#### SPARC Solaris with Sun C setups
@@ -255,7 +272,7 @@ my %table=(
255272

256273
#### SunOS configs, assuming sparc for the gcc one.
257274
#"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
258-
"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
275+
"sunos-gcc","gcc:-O3 -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
259276

260277
#### IRIX 5.x configs
261278
# -mips2 flag is added by ./config when appropriate.
@@ -398,7 +415,7 @@ my %table=(
398415
"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
399416
"linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
400417
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
401-
"linux-x86_64-clang", "clang: -m64 -DL_ENDIAN -O3 -Weverything $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
418+
"linux-x86_64-clang", "clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
402419
"linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
403420
"linux-x32", "gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
404421
"linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
@@ -419,7 +436,7 @@ my %table=(
419436
#### SPARC Linux setups
420437
# Ray Miller <[email protected]> has patiently
421438
# assisted with debugging of following two configs.
422-
"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
439+
"linux-sparcv8","gcc:-mcpu=v8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
423440
# it's a real mess with -mcpu=ultrasparc option under Linux, but
424441
# -Wa,-Av8plus should do the trick no matter what.
425442
"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -454,15 +471,15 @@ my %table=(
454471
"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
455472
"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
456473
"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
457-
"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
474+
"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
458475

459476
"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
460477
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
461478
# simply *happens* to work around a compiler bug in gcc 3.3.3,
462479
# triggered by RIPEMD160 code.
463480
"BSD-sparc64", "gcc:-DB_ENDIAN -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
464481
"BSD-ia64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
465-
"BSD-x86_64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
482+
"BSD-x86_64", "cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
466483

467484
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
468485

@@ -1195,6 +1212,7 @@ my $cc = $fields[$idx_cc];
11951212
if($ENV{CC}) {
11961213
$cc = $ENV{CC};
11971214
}
1215+
11981216
my $cflags = $fields[$idx_cflags];
11991217
my $unistd = $fields[$idx_unistd];
12001218
my $thread_cflag = $fields[$idx_thread_cflag];
@@ -1630,12 +1648,21 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
16301648

16311649
if ($strict_warnings)
16321650
{
1651+
my $ecc = $cc;
1652+
$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
16331653
my $wopt;
1634-
die "ERROR --strict-warnings requires gcc or clang" unless ($cc =~ /gcc$/ or $cc =~ /clang$/);
1654+
die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);
16351655
foreach $wopt (split /\s+/, $gcc_devteam_warn)
16361656
{
16371657
$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
16381658
}
1659+
if ($ecc eq "clang")
1660+
{
1661+
foreach $wopt (split /\s+/, $clang_devteam_warn)
1662+
{
1663+
$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
1664+
}
1665+
}
16391666
}
16401667

16411668
open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";

‎deps/openssl/openssl/Makefile

+10-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.2a
7+
VERSION=1.0.2b
88
MAJOR=1
99
MINOR=0.2
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -90,7 +90,7 @@ PROCESSOR=
9090
# CPUID module collects small commonly used assembler snippets
9191
CPUID_OBJ= mem_clr.o
9292
BN_ASM= bn_asm.o
93-
EC_ASM=
93+
EC_ASM=
9494
DES_ENC= des_enc.o fcrypt_b.o
9595
AES_ENC= aes_core.o aes_cbc.o
9696
BF_ENC= bf_enc.o
@@ -187,7 +187,7 @@ WTARFILE= $(NAME)-win.tar
187187
EXHEADER= e_os2.h
188188
HEADER= e_os.h
189189

190-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
190+
all: Makefile build_all
191191

192192
# as we stick to -e, CLEARENV ensures that local variables in lower
193193
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -273,7 +273,10 @@ reflect:
273273
sub_all: build_all
274274
build_all: build_libs build_apps build_tests build_tools
275275

276-
build_libs: build_crypto build_ssl build_engines
276+
build_libs: build_libcrypto build_libssl openssl.pc
277+
278+
build_libcrypto: build_crypto build_engines libcrypto.pc
279+
build_libssl: build_ssl libssl.pc
277280

278281
build_crypto:
279282
@dir=crypto; target=all; $(BUILD_ONE_CMD)
@@ -459,6 +462,9 @@ tests: rehash
459462
report:
460463
@$(PERL) util/selftest.pl
461464

465+
update: errors stacks util/libeay.num util/ssleay.num TABLE
466+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
467+
462468
depend:
463469
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
464470

@@ -483,26 +489,10 @@ util/libeay.num::
483489
util/ssleay.num::
484490
$(PERL) util/mkdef.pl ssl update
485491

486-
crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
487-
$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
488-
crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
489-
$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
490-
crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
491-
$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
492-
493-
apps/openssl-vms.cnf: apps/openssl.cnf
494-
$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
495-
496-
crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
497-
$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
498-
499-
500492
TABLE: Configure
501493
(echo 'Output of `Configure TABLE'"':"; \
502494
$(PERL) Configure TABLE) > TABLE
503495

504-
update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
505-
506496
# Build distribution tar-file. As the list of files returned by "find" is
507497
# pretty long, on several platforms a "too many arguments" error or similar
508498
# would occur. Therefore the list of files is temporarily stored into a file

0 commit comments

Comments
 (0)