Skip to content

Commit 67873a3

Browse files
anttikanteeanttikantee
committed
NetBSD src for "user", checkout.sh rev 86d473e21cc4b539ea0719c77096dd95a41b05f6
1 parent 6702388 commit 67873a3

File tree

587 files changed

+4171
-1972
lines changed

Some content is hidden

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

587 files changed

+4171
-1972
lines changed

‎crypto/external/bsd/openssl/dist/CHANGES

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,98 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.1o and 1.0.1p [9 Jul 2015]
6+
7+
*) Alternate chains certificate forgery
8+
9+
During certificate verfification, OpenSSL will attempt to find an
10+
alternative certificate chain if the first attempt to build such a chain
11+
fails. An error in the implementation of this logic can mean that an
12+
attacker could cause certain checks on untrusted certificates to be
13+
bypassed, such as the CA flag, enabling them to use a valid leaf
14+
certificate to act as a CA and "issue" an invalid certificate.
15+
16+
This issue was reported to OpenSSL by Adam Langley/David Benjamin
17+
(Google/BoringSSL).
18+
[Matt Caswell]
19+
20+
Changes between 1.0.1n and 1.0.1o [12 Jun 2015]
21+
22+
*) Fix HMAC ABI incompatibility. The previous version introduced an ABI
23+
incompatibility in the handling of HMAC. The previous ABI has now been
24+
restored.
25+
26+
Changes between 1.0.1m and 1.0.1n [11 Jun 2015]
27+
28+
*) Malformed ECParameters causes infinite loop
29+
30+
When processing an ECParameters structure OpenSSL enters an infinite loop
31+
if the curve specified is over a specially malformed binary polynomial
32+
field.
33+
34+
This can be used to perform denial of service against any
35+
system which processes public keys, certificate requests or
36+
certificates. This includes TLS clients and TLS servers with
37+
client authentication enabled.
38+
39+
This issue was reported to OpenSSL by Joseph Barr-Pixton.
40+
(CVE-2015-1788)
41+
[Andy Polyakov]
42+
43+
*) Exploitable out-of-bounds read in X509_cmp_time
44+
45+
X509_cmp_time does not properly check the length of the ASN1_TIME
46+
string and can read a few bytes out of bounds. In addition,
47+
X509_cmp_time accepts an arbitrary number of fractional seconds in the
48+
time string.
49+
50+
An attacker can use this to craft malformed certificates and CRLs of
51+
various sizes and potentially cause a segmentation fault, resulting in
52+
a DoS on applications that verify certificates or CRLs. TLS clients
53+
that verify CRLs are affected. TLS clients and servers with client
54+
authentication enabled may be affected if they use custom verification
55+
callbacks.
56+
57+
This issue was reported to OpenSSL by Robert Swiecki (Google), and
58+
independently by Hanno B�ck.
59+
(CVE-2015-1789)
60+
[Emilia K�sper]
61+
62+
*) PKCS7 crash with missing EnvelopedContent
63+
64+
The PKCS#7 parsing code does not handle missing inner EncryptedContent
65+
correctly. An attacker can craft malformed ASN.1-encoded PKCS#7 blobs
66+
with missing content and trigger a NULL pointer dereference on parsing.
67+
68+
Applications that decrypt PKCS#7 data or otherwise parse PKCS#7
69+
structures from untrusted sources are affected. OpenSSL clients and
70+
servers are not affected.
71+
72+
This issue was reported to OpenSSL by Michal Zalewski (Google).
73+
(CVE-2015-1790)
74+
[Emilia K�sper]
75+
76+
*) CMS verify infinite loop with unknown hash function
77+
78+
When verifying a signedData message the CMS code can enter an infinite loop
79+
if presented with an unknown hash function OID. This can be used to perform
80+
denial of service against any system which verifies signedData messages using
81+
the CMS code.
82+
This issue was reported to OpenSSL by Johannes Bauer.
83+
(CVE-2015-1792)
84+
[Stephen Henson]
85+
86+
*) Race condition handling NewSessionTicket
87+
88+
If a NewSessionTicket is received by a multi-threaded client when attempting to
89+
reuse a previous ticket then a race condition can occur potentially leading to
90+
a double free of the ticket data.
91+
(CVE-2015-1791)
92+
[Matt Caswell]
93+
94+
*) Reject DH handshakes with parameters shorter than 768 bits.
95+
[Kurt Roeckx and Emilia Kasper]
96+
597
Changes between 1.0.1l and 1.0.1m [19 Mar 2015]
698

799
*) Segmentation fault in ASN1_TYPE_cmp fix

‎crypto/external/bsd/openssl/dist/Configure

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ my %table=(
230230

231231
#### SPARC Solaris with GNU C setups
232232
"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)",
233-
"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)",
233+
"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)",
234234
# -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
235235
"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)",
236236
"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",
237237
####
238-
"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)",
238+
"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)",
239239
"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)",
240240

241241
#### SPARC Solaris with Sun C setups
@@ -252,7 +252,7 @@ my %table=(
252252

253253
#### SunOS configs, assuming sparc for the gcc one.
254254
#"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
255-
"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
255+
"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}::",
256256

257257
#### IRIX 5.x configs
258258
# -mips2 flag is added by ./config when appropriate.
@@ -379,7 +379,7 @@ my %table=(
379379
#### SPARC Linux setups
380380
# Ray Miller <[email protected]> has patiently
381381
# assisted with debugging of following two configs.
382-
"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)",
382+
"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)",
383383
# it's a real mess with -mcpu=ultrasparc option under Linux, but
384384
# -Wa,-Av8plus should do the trick no matter what.
385385
"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)",
@@ -413,7 +413,7 @@ my %table=(
413413
"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)",
414414
"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)",
415415
"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)",
416-
"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)",
416+
"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)",
417417

418418
"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)",
419419
# -DMD32_REG_T=int doesn't actually belong in sparc64 target, it

‎crypto/external/bsd/openssl/dist/Makefile

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.1m
7+
VERSION=1.0.1p
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -186,7 +186,7 @@ WTARFILE= $(NAME)-win.tar
186186
EXHEADER= e_os2.h
187187
HEADER= e_os.h
188188

189-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
189+
all: Makefile build_all
190190

191191
# as we stick to -e, CLEARENV ensures that local variables in lower
192192
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -270,21 +270,25 @@ reflect:
270270
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
271271

272272
sub_all: build_all
273+
273274
build_all: build_libs build_apps build_tests build_tools
274275

275-
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
276280

277281
build_crypto:
278282
@dir=crypto; target=all; $(BUILD_ONE_CMD)
279-
build_ssl:
283+
build_ssl: build_crypto
280284
@dir=ssl; target=all; $(BUILD_ONE_CMD)
281-
build_engines:
285+
build_engines: build_crypto
282286
@dir=engines; target=all; $(BUILD_ONE_CMD)
283-
build_apps:
287+
build_apps: build_libs
284288
@dir=apps; target=all; $(BUILD_ONE_CMD)
285-
build_tests:
289+
build_tests: build_libs
286290
@dir=test; target=all; $(BUILD_ONE_CMD)
287-
build_tools:
291+
build_tools: build_libs
288292
@dir=tools; target=all; $(BUILD_ONE_CMD)
289293

290294
all_testapps: build_libs build_testapps
@@ -461,6 +465,9 @@ tests: rehash
461465
report:
462466
@$(PERL) util/selftest.pl
463467

468+
update: errors stacks util/libeay.num util/ssleay.num TABLE
469+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
470+
464471
depend:
465472
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
466473

@@ -485,26 +492,10 @@ util/libeay.num::
485492
util/ssleay.num::
486493
$(PERL) util/mkdef.pl ssl update
487494

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

506-
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
507-
508499
# Build distribution tar-file. As the list of files returned by "find" is
509500
# pretty long, on several platforms a "too many arguments" error or similar
510501
# would occur. Therefore the list of files is temporarily stored into a file

‎crypto/external/bsd/openssl/dist/Makefile.org

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ WTARFILE= $(NAME)-win.tar
184184
EXHEADER= e_os2.h
185185
HEADER= e_os.h
186186

187-
all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
187+
all: Makefile build_all
188188

189189
# as we stick to -e, CLEARENV ensures that local variables in lower
190190
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -268,21 +268,25 @@ reflect:
268268
@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
269269

270270
sub_all: build_all
271+
271272
build_all: build_libs build_apps build_tests build_tools
272273

273-
build_libs: build_crypto build_ssl build_engines
274+
build_libs: build_libcrypto build_libssl openssl.pc
275+
276+
build_libcrypto: build_crypto build_engines libcrypto.pc
277+
build_libssl: build_ssl libssl.pc
274278

275279
build_crypto:
276280
@dir=crypto; target=all; $(BUILD_ONE_CMD)
277-
build_ssl:
281+
build_ssl: build_crypto
278282
@dir=ssl; target=all; $(BUILD_ONE_CMD)
279-
build_engines:
283+
build_engines: build_crypto
280284
@dir=engines; target=all; $(BUILD_ONE_CMD)
281-
build_apps:
285+
build_apps: build_libs
282286
@dir=apps; target=all; $(BUILD_ONE_CMD)
283-
build_tests:
287+
build_tests: build_libs
284288
@dir=test; target=all; $(BUILD_ONE_CMD)
285-
build_tools:
289+
build_tools: build_libs
286290
@dir=tools; target=all; $(BUILD_ONE_CMD)
287291

288292
all_testapps: build_libs build_testapps
@@ -459,6 +463,9 @@ tests: rehash
459463
report:
460464
@$(PERL) util/selftest.pl
461465

466+
update: errors stacks util/libeay.num util/ssleay.num TABLE
467+
@set -e; target=update; $(RECURSIVE_BUILD_CMD)
468+
462469
depend:
463470
@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
464471

@@ -483,26 +490,10 @@ util/libeay.num::
483490
util/ssleay.num::
484491
$(PERL) util/mkdef.pl ssl update
485492

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-
500493
TABLE: Configure
501494
(echo 'Output of `Configure TABLE'"':"; \
502495
$(PERL) Configure TABLE) > TABLE
503496

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-
506497
# Build distribution tar-file. As the list of files returned by "find" is
507498
# pretty long, on several platforms a "too many arguments" error or similar
508499
# would occur. Therefore the list of files is temporarily stored into a file

‎crypto/external/bsd/openssl/dist/NEWS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
This file gives a brief overview of the major changes between each OpenSSL
66
release. For more details please read the CHANGES file.
77

8+
Major changes between OpenSSL 1.0.1o and OpenSSL 1.0.1p [9 Jul 2015]
9+
10+
o Alternate chains certificate forgery (CVE-2015-1793)
11+
12+
Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015]
13+
14+
o Fix HMAC ABI incompatibility
15+
16+
Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015]
17+
18+
o Malformed ECParameters causes infinite loop (CVE-2015-1788)
19+
o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
20+
o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
21+
o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
22+
o Race condition handling NewSessionTicket (CVE-2015-1791)
23+
824
Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
925

1026
o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)

‎crypto/external/bsd/openssl/dist/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
OpenSSL 1.0.1m 19 Mar 2015
2+
OpenSSL 1.0.1p 9 Jul 2015
33

44
Copyright (c) 1998-2011 The OpenSSL Project
55
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

‎crypto/external/bsd/openssl/dist/apps/Makefile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
9494
sreq.o: req.c
9595
$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
9696

97+
openssl-vms.cnf: openssl.cnf
98+
$(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf
99+
97100
files:
98101
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
99102

@@ -127,12 +130,12 @@ links:
127130
lint:
128131
lint -DLINT $(INCLUDES) $(SRC)>fluff
129132

130-
depend:
131-
@if [ -z "$(THIS)" ]; then \
132-
$(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
133-
else \
134-
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
135-
fi
133+
update: openssl-vms.cnf local_depend
134+
135+
depend: local_depend
136+
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
137+
local_depend:
138+
@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
136139

137140
dclean:
138141
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -144,10 +147,10 @@ clean:
144147
rm -f req
145148

146149
$(DLIBSSL):
147-
(cd ..; $(MAKE) DIRS=ssl all)
150+
(cd ..; $(MAKE) build_libssl)
148151

149152
$(DLIBCRYPTO):
150-
(cd ..; $(MAKE) DIRS=crypto all)
153+
(cd ..; $(MAKE) build_libcrypto)
151154

152155
$(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
153156
$(RM) $(EXE)

0 commit comments

Comments
 (0)