Skip to content

Commit 8002554

Browse files
anttikanteeanttikantee
committed
NetBSD src for "user", checkout.sh rev 8c1beeb3cf1baf201271ca639013a5a314773952
1 parent 4c1e9a2 commit 8002554

Some content is hidden

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

114 files changed

+571
-393
lines changed

‎crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS

+2-30
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,2 @@
1-
The OpenSSL project depends on volunteer efforts and financial support from
2-
the end user community. That support comes in the form of donations and paid
3-
sponsorships, software support contracts, paid consulting services
4-
and commissioned software development.
5-
6-
Since all these activities support the continued development and improvement
7-
of OpenSSL we consider all these clients and customers as sponsors of the
8-
OpenSSL project.
9-
10-
We would like to identify and thank the following such sponsors for their past
11-
or current significant support of the OpenSSL project:
12-
13-
Major support:
14-
15-
Qualys http://www.qualys.com/
16-
17-
Very significant support:
18-
19-
OpenGear: http://www.opengear.com/
20-
21-
Significant support:
22-
23-
PSW Group: http://www.psw.net/
24-
Acano Ltd. http://acano.com/
25-
26-
Please note that we ask permission to identify sponsors and that some sponsors
27-
we consider eligible for inclusion here have requested to remain anonymous.
28-
29-
Additional sponsorship or financial support is always welcome: for more
30-
information please contact the OpenSSL Software Foundation.
1+
Please https://www.openssl.org/community/thanks.html for the current
2+
acknowledgements.

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

+24
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.1q and 1.0.1r [28 Jan 2016]
6+
7+
*) Protection for DH small subgroup attacks
8+
9+
As a precautionary measure the SSL_OP_SINGLE_DH_USE option has been
10+
switched on by default and cannot be disabled. This could have some
11+
performance impact.
12+
[Matt Caswell]
13+
14+
*) SSLv2 doesn't block disabled ciphers
15+
16+
A malicious client can negotiate SSLv2 ciphers that have been disabled on
17+
the server and complete SSLv2 handshakes even if all SSLv2 ciphers have
18+
been disabled, provided that the SSLv2 protocol was not also disabled via
19+
SSL_OP_NO_SSLv2.
20+
21+
This issue was reported to OpenSSL on 26th December 2015 by Nimrod Aviram
22+
and Sebastian Schinzel.
23+
(CVE-2015-3197)
24+
[Viktor Dukhovni]
25+
26+
*) Reject DH handshakes with parameters shorter than 1024 bits.
27+
[Kurt Roeckx]
28+
529
Changes between 1.0.1p and 1.0.1q [3 Dec 2015]
630

731
*) Certificate verify crash with missing PSS parameter

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

+18-15
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ 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+
# Warn that "make depend" should be run?
109+
my $warn_make_depend = 0;
110+
108111
my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments";
109112

110113
my $strict_warnings = 0;
@@ -1446,7 +1449,7 @@ if ($target =~ /\-icc$/) # Intel C compiler
14461449
# linker only when --prefix is not /usr.
14471450
if ($target =~ /^BSD\-/)
14481451
{
1449-
$shared_ldflag.=" -Wl,-rpath,\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
1452+
$shared_ldflag.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
14501453
}
14511454

14521455
if ($sys_id ne "")
@@ -1953,14 +1956,8 @@ EOF
19531956
&dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
19541957
}
19551958
if ($depflags ne $default_depflags && !$make_depend) {
1956-
print <<EOF;
1957-
1958-
Since you've disabled or enabled at least one algorithm, you need to do
1959-
the following before building:
1960-
1961-
make depend
1962-
EOF
1963-
}
1959+
$warn_make_depend++;
1960+
}
19641961
}
19651962

19661963
# create the ms/version32.rc file if needed
@@ -2039,12 +2036,18 @@ EOF
20392036

20402037
print <<\EOF if ($no_shared_warn);
20412038

2042-
You gave the option 'shared'. Normally, that would give you shared libraries.
2043-
Unfortunately, the OpenSSL configuration doesn't include shared library support
2044-
for this platform yet, so it will pretend you gave the option 'no-shared'. If
2045-
you can inform the developpers (openssl-dev\@openssl.org) how to support shared
2046-
libraries on this platform, they will at least look at it and try their best
2047-
(but please first make sure you have tried with a current version of OpenSSL).
2039+
You gave the option 'shared', which is not supported on this platform, so
2040+
we will pretend you gave the option 'no-shared'. If you know how to implement
2041+
shared libraries, please let us know (but please first make sure you have
2042+
tried with a current version of OpenSSL).
2043+
EOF
2044+
2045+
print <<EOF if ($warn_make_depend);
2046+
2047+
*** Because of configuration changes, you MUST do the following before
2048+
*** building:
2049+
2050+
make depend
20482051
EOF
20492052

20502053
exit(0);

‎crypto/external/bsd/openssl/dist/INSTALL

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@
164164
standard headers). If it is a problem with OpenSSL itself, please
165165
report the problem to <[email protected]> (note that your
166166
message will be recorded in the request tracker publicly readable
167-
via http://www.openssl.org/support/rt.html and will be forwarded to a
168-
public mailing list). Include the output of "make report" in your message.
169-
Please check out the request tracker. Maybe the bug was already
170-
reported or has already been fixed.
167+
at https://www.openssl.org/community/index.html#bugs and will be
168+
forwarded to a public mailing list). Include the output of "make
169+
report" in your message. Please check out the request tracker. Maybe
170+
the bug was already reported or has already been fixed.
171171

172172
[If you encounter assembler error messages, try the "no-asm"
173173
configuration option as an immediate fix.]

‎crypto/external/bsd/openssl/dist/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
---------------
1313

1414
/* ====================================================================
15-
* Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.
15+
* Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
1616
*
1717
* Redistribution and use in source and binary forms, with or without
1818
* modification, are permitted provided that the following conditions

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

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

7-
VERSION=1.0.1q
7+
VERSION=1.0.1r
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0
@@ -181,8 +181,7 @@ SHARED_LDFLAGS=
181181
GENERAL= Makefile
182182
BASENAME= openssl
183183
NAME= $(BASENAME)-$(VERSION)
184-
TARFILE= $(NAME).tar
185-
WTARFILE= $(NAME)-win.tar
184+
TARFILE= ../$(NAME).tar
186185
EXHEADER= e_os2.h
187186
HEADER= e_os.h
188187

@@ -501,38 +500,35 @@ TABLE: Configure
501500
# would occur. Therefore the list of files is temporarily stored into a file
502501
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
503502
# tar does not support the --files-from option.
504-
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
505-
--owner openssl:0 --group openssl:0 \
506-
--transform 's|^|openssl-$(VERSION)/|' \
503+
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
504+
--owner 0 --group 0 \
505+
--transform 's|^|$(NAME)/|' \
507506
-cvf -
508507

509-
../$(TARFILE).list:
508+
$(TARFILE).list:
510509
find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
511510
\! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \
512-
\! -name '*test' \! -name '.#*' \! -name '*~' \
513-
| sort > ../$(TARFILE).list
511+
\( \! -name '*test' -o -name bctest -o -name pod2mantest \) \
512+
\! -name '.#*' \! -name '*~' \! -type l \
513+
| sort > $(TARFILE).list
514514

515-
tar: ../$(TARFILE).list
515+
tar: $(TARFILE).list
516516
find . -type d -print | xargs chmod 755
517517
find . -type f -print | xargs chmod a+r
518518
find . -type f -perm -0100 -print | xargs chmod a+x
519-
$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
520-
rm -f ../$(TARFILE).list
521-
ls -l ../$(TARFILE).gz
519+
$(TAR_COMMAND) | gzip --best > $(TARFILE).gz
520+
rm -f $(TARFILE).list
521+
ls -l $(TARFILE).gz
522522

523-
tar-snap: ../$(TARFILE).list
524-
$(TAR_COMMAND) > ../$(TARFILE)
525-
rm -f ../$(TARFILE).list
526-
ls -l ../$(TARFILE)
523+
tar-snap: $(TARFILE).list
524+
$(TAR_COMMAND) > $(TARFILE)
525+
rm -f $(TARFILE).list
526+
ls -l $(TARFILE)
527527

528528
dist:
529529
$(PERL) Configure dist
530-
@$(MAKE) dist_pem_h
531530
@$(MAKE) SDIRS='$(SDIRS)' clean
532-
@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
533-
534-
dist_pem_h:
535-
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
531+
@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
536532

537533
install: all install_docs install_sw
538534

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

+17-21
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,7 @@ SHARED_LDFLAGS=
179179
GENERAL= Makefile
180180
BASENAME= openssl
181181
NAME= $(BASENAME)-$(VERSION)
182-
TARFILE= $(NAME).tar
183-
WTARFILE= $(NAME)-win.tar
182+
TARFILE= ../$(NAME).tar
184183
EXHEADER= e_os2.h
185184
HEADER= e_os.h
186185

@@ -499,38 +498,35 @@ TABLE: Configure
499498
# would occur. Therefore the list of files is temporarily stored into a file
500499
# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
501500
# tar does not support the --files-from option.
502-
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
503-
--owner openssl:0 --group openssl:0 \
504-
--transform 's|^|openssl-$(VERSION)/|' \
501+
TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
502+
--owner 0 --group 0 \
503+
--transform 's|^|$(NAME)/|' \
505504
-cvf -
506505

507-
../$(TARFILE).list:
506+
$(TARFILE).list:
508507
find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
509508
\! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \
510-
\! -name '*test' \! -name '.#*' \! -name '*~' \
511-
| sort > ../$(TARFILE).list
509+
\( \! -name '*test' -o -name bctest -o -name pod2mantest \) \
510+
\! -name '.#*' \! -name '*~' \! -type l \
511+
| sort > $(TARFILE).list
512512

513-
tar: ../$(TARFILE).list
513+
tar: $(TARFILE).list
514514
find . -type d -print | xargs chmod 755
515515
find . -type f -print | xargs chmod a+r
516516
find . -type f -perm -0100 -print | xargs chmod a+x
517-
$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
518-
rm -f ../$(TARFILE).list
519-
ls -l ../$(TARFILE).gz
517+
$(TAR_COMMAND) | gzip --best > $(TARFILE).gz
518+
rm -f $(TARFILE).list
519+
ls -l $(TARFILE).gz
520520

521-
tar-snap: ../$(TARFILE).list
522-
$(TAR_COMMAND) > ../$(TARFILE)
523-
rm -f ../$(TARFILE).list
524-
ls -l ../$(TARFILE)
521+
tar-snap: $(TARFILE).list
522+
$(TAR_COMMAND) > $(TARFILE)
523+
rm -f $(TARFILE).list
524+
ls -l $(TARFILE)
525525

526526
dist:
527527
$(PERL) Configure dist
528-
@$(MAKE) dist_pem_h
529528
@$(MAKE) SDIRS='$(SDIRS)' clean
530-
@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
531-
532-
dist_pem_h:
533-
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
529+
@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
534530

535531
install: all install_docs install_sw
536532

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

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
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.1q and OpenSSL 1.0.1r [28 Jan 2016]
9+
10+
o Protection for DH small subgroup attacks
11+
o SSLv2 doesn't block disabled ciphers (CVE-2015-3197)
12+
813
Major changes between OpenSSL 1.0.1p and OpenSSL 1.0.1q [3 Dec 2015]
914

1015
o Certificate verify crash with missing PSS parameter (CVE-2015-3194)

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
OpenSSL 1.0.1q 3 Dec 2015
2+
OpenSSL 1.0.1r 28 Jan 2016
33

44
Copyright (c) 1998-2015 The OpenSSL Project
55
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
@@ -90,11 +90,12 @@
9090

9191
In order to avoid spam, this is a moderated mailing list, and it might
9292
take a day for the ticket to show up. (We also scan posts to make sure
93-
that security disclosures aren't publically posted by mistake.) Mail to
94-
this address is recorded in the public RT (request tracker) database (see
95-
https://www.openssl.org/support/rt.html for details) and also forwarded
96-
the public openssl-dev mailing list. Confidential mail may be sent to
97-
[email protected] (PGP key available from the key servers).
93+
that security disclosures aren't publically posted by mistake.) Mail
94+
to this address is recorded in the public RT (request tracker) database
95+
(see https://www.openssl.org/community/index.html#bugs for details) and
96+
also forwarded the public openssl-dev mailing list. Confidential mail
97+
may be sent to [email protected] (PGP key available from the
98+
key servers).
9899

99100
Please do NOT use this for general assistance or support queries.
100101
Just because something doesn't work the way you expect does not mean it

‎crypto/external/bsd/openssl/dist/apps/engine.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
1+
/* apps/engine.c */
22
/*
33
* Written by Richard Levitte <[email protected]> for the OpenSSL project
44
* 2000.

‎crypto/external/bsd/openssl/dist/apps/ocsp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req,
10031003
bs = OCSP_BASICRESP_new();
10041004
thisupd = X509_gmtime_adj(NULL, 0);
10051005
if (ndays != -1)
1006-
nextupd = X509_gmtime_adj(NULL, nmin * 60 + ndays * 3600 * 24);
1006+
nextupd = X509_time_adj_ex(NULL, ndays, nmin * 60, NULL);
10071007

10081008
/* Examine each certificate id in the request */
10091009
for (i = 0; i < id_count; i++) {

0 commit comments

Comments
 (0)