10000 [3.11] gh-99079: Update macOS installer to use OpenSSL 3.0.9. (GH-107… · python/cpython@b8beb07 · GitHub
[go: up one dir, main page]
Skip to content

Commit b8beb07

Browse files
ned-deilyned-deily
authored
[3.11] gh-99079: Update macOS installer to use OpenSSL 3.0.9. (GH-107476)
1 parent 9690efc commit b8beb07

File tree

3 files changed

+184
-131
lines changed

3 files changed

+184
-131
lines changed

‎Doc/license.rst

Lines changed: 180 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -657,134 +657,186 @@ The modules :mod:`hashlib`, :mod:`posix`, :mod:`ssl`, :mod:`crypt` use
657657
the OpenSSL library for added performance if made available by the
658658
operating system. Additionally, the Windows and macOS installers for
659659
Python may include a copy of the OpenSSL libraries, so we include a copy
660-
of the OpenSSL license here::
661-
662-
663-
LICENSE ISSUES
664-
==============
665-
666-
The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
667-
the OpenSSL License and the original SSLeay license apply to the toolkit.
668-
See below for the actual license texts. Actually both licenses are BSD-style
669-
Open Source licenses. In case of any license issues related to OpenSSL
670-
please contact openssl-core@openssl.org.
671-
672-
OpenSSL License
673-
---------------
674-
675-
/* ====================================================================
676-
* Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
677-
*
678-
* Redistribution and use in source and binary forms, with or without
679-
* modification, are permitted provided that the following conditions
680-
* are met:
681-
*
682-
* 1. Redistributions of source code must retain the above copyright
683-
* notice, this list of conditions and the following disclaimer.
684-
*
685-
* 2. Redistributions in binary form must reproduce the above copyright
686-
* notice, this list of conditions and the following disclaimer in
687-
* the documentation and/or other materials provided with the
688-
* distribution.
689-
*
690-
* 3. All advertising materials mentioning features or use of this
691-
* software must display the following acknowledgment:
692-
* "This product includes software developed by the OpenSSL Project
693-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
694-
*
695-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
696-
* endorse or promote products derived from this software without
697-
* prior written permission. For written permission, please contact
698-
* openssl-core@openssl.org.
699-
*
700-
* 5. Products derived from this software may not be called "OpenSSL"
701-
* nor may "OpenSSL" appear in their names without prior written
702-
* permission of the OpenSSL Project.
703-
*
704-
* 6. Redistributions of any form whatsoever must retain the following
705-
* acknowledgment:
706-
* "This product includes software developed by the OpenSSL Project
707-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
708-
*
709-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
710-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
711-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
712-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
713-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
714-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
715-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
716-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
717-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
718-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
719-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
720-
* OF THE POSSIBILITY OF SUCH DAMAGE.
721-
* ====================================================================
722-
*
723-
* This product includes cryptographic software written by Eric Young
724-
* (eay@cryptsoft.com). This product includes software written by Tim
725-
* Hudson (tjh@cryptsoft.com).
726-
*
727-
*/
728-
729-
Original SSLeay License
730-
-----------------------
731-
732-
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
733-
* All rights reserved.
734-
*
735-
* This package is an SSL implementation written
736-
* by Eric Young (eay@cryptsoft.com).
737-
* The implementation was written so as to conform with Netscapes SSL.
738-
*
739-
* This library is free for commercial and non-commercial use as long as
740-
* the following conditions are aheared to. The following conditions
741-
* apply to all code found in this distribution, be it the RC4, RSA,
742-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
743-
* included with this distribution is covered by the same copyright terms
744-
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
745-
*
746-
* Copyright remains Eric Young's, and as such any Copyright notices in
747-
* the code are not to be removed.
748-
* If this package is used in a product, Eric Young should be given attribution
749-
* as the author of the parts of the library used.
750-
* This can be in the form of a textual message at program startup or
751-
* in documentation (online or textual) provided with the package.
752-
*
753-
* Redistribution and use in source and binary forms, with or without
754-
* modification, are permitted provided that the following conditions
755-
* are met:
756-
* 1. Redistributions of source code must retain the copyright
757-
* notice, this list of conditions and the following disclaimer.
758-
* 2. Redistributions in binary form must reproduce the above copyright
759-
* notice, this list of conditions and the following disclaimer in the
760-
* documentation and/or other materials provided with the distribution.
761-
* 3. All advertising materials mentioning features or use of this software
762-
* must display the following acknowledgement:
763-
* "This product includes cryptographic software written by
764-
* Eric Young (eay@cryptsoft.com)"
765-
* The word 'cryptographic' can be left out if the rouines from the library
766-
* being used are not cryptographic related :-).
767-
* 4. If you include any Windows specific code (or a derivative thereof) from
768-
* the apps directory (application code) you must include an acknowledgement:
769-
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
770-
*
771-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
772-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
773-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
774-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
775-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
776-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
777-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
778-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
779-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
780-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
781-
* SUCH DAMAGE.
782-
*
783-
* The licence and distribution terms for any publically available version or
784-
* derivative of this code cannot be changed. i.e. this code cannot simply be
785-
* copied and put under another distribution licence
786-
* [including the GNU Public Licence.]
787-
*/
660+
of the OpenSSL license here. For the OpenSSL 3.0 release,
661+
and later releases derived from that, the Apache License v2 applies::
662+
663+
664+
Apache License
665+
Version 2.0, January 2004
666+
https://www.apache.org/licenses/
667+
668+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
669+
670+
1. Definitions.
671+
672+
"License" shall mean the terms and conditions for use, reproduction,
673+
and distribution as defined by Sections 1 through 9 of this document.
674+
675+
"Licensor" shall mean the copyright owner or entity authorized by
676+
the copyright owner that is granting the License.
677+
678+
"Legal Entity" shall mean the union of the acting entity and all
679+
other entities that control, are controlled by, or are under common
680+
control with that entity. For the purposes of this definition,
681+
"control" means (i) the power, direct or indirect, to cause the
682+
direction or management of such entity, whether by contract or
683+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
684+
outstanding shares, or (iii) beneficial ownership of such entity.
685+
686+
"You" (or "Your") shall mean an individual or Legal Entity
687+
exercising permissions granted by this License.
688+
689+
"Source" form shall mean the preferred form for making modifications,
690+
including but not limited to software source code, documentation
691+
source, and configuration files.
692+
693+
"Object" form shall mean any form resulting from mechanical
694+
transformation or translation of a Source form, including but
695+
not limited to compiled object code, generated documentation,
696+
and conversions to other media types.
697+
698+
"Work" shall mean the work of authorship, whether in Source or
699+
Object form, made available under the License, as indicated by a
700+
copyright notice that is included in or attached to the work
701+
(an example is provided in the Appendix below).
702+
703+
"Derivative Works" shall mean any work, whether in Source or Object
704+
form, that is based on (or derived from) the Work and for which the
705+
editorial revisions, annotations, elaborations, or other modifications
706+
represent, as a whole, an original work of authorship. For the purposes
707+
of this License, Derivative Works shall not include works that remain
708+
separable from, or merely link (or bind by name) to the interfaces of,
709+
the Work and Derivative Works thereof.
710+
711+
"Contribution" shall mean any work of authorship, including
712+
the original version of the Work and any modifications or additions
713+
to that Work or Derivative Works thereof, that is intentionally
714+
submitted to Licensor for inclusion in the Work by the copyright owner
715+
or by an individual or Legal Entity authorized to submit on behalf of
716+
the copyright owner. For the purposes of this definition, "submitted"
717+
means any form of electronic, verbal, or written communication sent
718+
to the Licensor or its representatives, including but not limited to
719+
communication on electronic mailing lists, source code control systems,
720+
and issue tracking systems that are managed by, or on behalf of, the
721+
Licensor for the purpose of discussing and improving the Work, but
722+
excluding communication that is conspicuously marked or otherwise
723+
designated in writing by the copyright owner as "Not a Contribution."
724+
725+
"Contributor" shall mean Licensor and any individual or Legal Entity
726+
on behalf of whom a Contribution has been received by Licensor and
727+
subsequently incorporated within the Work.
728+
729+
2. Grant of Copyright License. Subject to the terms and conditions of
730+
this License, each Contributor hereby grants to You a perpetual,
731+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
732+
copyright license to reproduce, prepare Derivative Works of,
733+
publicly display, publicly perform, sublicense, and distribute the
734+
Work and such Derivative Works in Source or Object form.
735+
736+
3. Grant of Patent License. Subject to the terms and conditions of
737+
this License, each Contributor hereby grants to You a perpetual,
738+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
739+
(except as stated in this section) patent license to make, have made,
740+
use, offer to sell, sell, import, and otherwise transfer the Work,
741+
where such license applies only to those patent claims licensable
742+
by such Contributor that are necessarily infringed by their
743+
Contribution(s) alone or by combination of their Contribution(s)
744+
with the Work to which such Contribution(s) was submitted. If You
745+
institute patent litigation against any entity (including a
746+
cross-claim or counterclaim in a lawsuit) alleging that the Work
747+
or a Contribution incorporated within the Work constitutes direct
748+
or contributory patent infringement, then any patent licenses
749+
granted to You under this License for that Work shall terminate
750+
as of the date such litigation is filed.
751+
752+
4. Redistribution. You may reproduce and distribute copies of the
753+
Work or Derivative Works thereof in any medium, with or without
754+
modifications, and in Source or Object form, provided that You
755+
meet the following conditions:
756+
757+
(a) You must give any other recipients of the Work or
758+
Derivative Works a copy of this License; and
759+
760+
(b) You must cause any modified files to carry prominent notices
761+
stating that You changed the files; and
762+
763+
(c) You must retain, in the Source form of any Derivative Works
764+
that You distribute, all copyright, patent, trademark, and
765+
attribution notices from the Source form of the Work,
766+
excluding those notices that do not pertain to any part of
767+
the Derivative Works; and
768+
769+
(d) If the Work includes a "NOTICE" text file as part of its
770+
distribution, then any Derivative Works that You distribute must
771+
include a readable copy of the attribution notices contained
772+
within such NOTICE file, excluding those notices that do not
773+
pertain to any part of the Derivative Works, in at least one
774+
of the following places: within a NOTICE text file distributed
775+
as part of the Derivative Works; within the Source form or
776+
documentation, if provided along with the Derivative Works; or,
777+
within a display generated by the Derivative Works, if and
778+
wherever such third-party notices normally appear. The contents
779+
of the NOTICE file are for informational purposes only and
780+
do not modify the License. You may add Your own attribution
781+
notices within Derivative Works that You distribute, alongside
782+
or as an addendum to the NOTICE text from the Work, provided
783+
that such additional attribution notices cannot be construed
784+
as modifying the License.
785+
786+
You may add Your own copyright statement to Your modifications and
787+
may provide additional or different license terms and conditions
788+
for use, reproduction, or distribution of Your modifications, or
789+
for any such Derivative Works as a whole, provided Your use,
790+
reproduction, and distribution of the Work otherwise complies with
791+
the conditions stated in this License.
792+
793+
5. Submission of Contributions. Unless You explicitly state otherwise,
794+
any Contribution intentionally submitted for inclusion in the Work
795+
by You to the Licensor shall be under the terms and conditions of
796+
this License, without any additional terms or conditions.
797+
Notwithstanding the above, nothing herein shall supersede or modify
798+
the terms of any separate license agreement you may have executed
799+
with Licensor regarding such Contributions.
800+
801+
6. Trademarks. This License does not grant permission to use the trade
802+
names, trademarks, service marks, or product names of the Licensor,
803+
except as required for reasonable and customary use in describing the
804+
origin of the Work and reproducing the content of the NOTICE file.
805+
806+
7. Disclaimer of Warranty. Unless required by applicable law or
807+
agreed to in writing, Licensor provides the Work (and each
808+
Contributor provides its Contributions) on an "AS IS" BASIS,
809+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
810+
implied, including, without limitation, any warranties or conditions
811+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
812+
PARTICULAR PURPOSE. You are solely responsible for determining the
813+
appropriateness of using or redistributing the Work and assume any
814+
risks associated with Your exercise of permissions under this License.
815+
816+
8. Limitation of Liability. In no event and under no legal theory,
817+
whether in tort (including negligence), contract, or otherwise,
818+
unless required by applicable law (such as deliberate and grossly
819+
negligent acts) or agreed to in writing, shall any Contributor be
820+
liable to You for damages, including any direct, indirect, special,
821+
incidental, or consequential damages of any character arising as a
822+
result of this License or out of the use or inability to use the
823+
Work (including but not limited to damages for loss of goodwill,
824+
work stoppage, computer failure or malfunction, or any and all
825+
other commercial damages or losses), even if such Contributor
826+
has been advised of the possibility of such damages.
827+
828+
9. Accepting Warranty or Additional Liability. While redistributing
829+
the Work or Derivative Works thereof, You may choose to offer,
830+
and charge a fee for, acceptance of support, warranty, indemnity,
831+
or other liability obligations and/or rights consistent with this
832+
License. However, in accepting such obligations, You may act only
833+
on Your own behalf and on Your sole responsibility, not on behalf
834+
of any other Contributor, and only if You agree to indemnify,
835+
defend, and hold each Contributor harmless for any liability
836+
incurred by, or claims asserted against, such Contributor by reason
837+
of your accepting any such warranty or additional liability.
838+
839+
END OF TERMS AND CONDITIONS
788840

789841

790842
expat

‎Mac/BuildScript/build-installer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ def library_recipes():
246246

247247
result.extend([
248248
dict(
249-
name="OpenSSL 1.1.1u",
250-
url="https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
251-
checksum='e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6',
249+
name="OpenSSL 3.0.9",
250+
url="https://www.openssl.org/source/openssl-3.0.9.tar.gz",
251+
checksum='eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90',
252252
buildrecipe=build_universal_openssl,
253253
configure=None,
254254
install=None,

‎Misc/NEWS.d/next/macOS/2023-07-30-23-42-20.gh-issue-99079.JAtoh1.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update macOS installer to use OpenSSL 3.0.9.

0 commit comments

Comments
 (0)
0