Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 516302b

Browse files
committed
openssl: update dynamic to OpenSSL 3.0 definitions
Use the definitions from OpenSSL 3.0 so that we can move to the OpenSSL 3.0 license (Apache).
1 parent bdb12e9 commit 516302b

File tree

2 files changed

+7
-242
lines changed

2 files changed

+7
-242
lines changed

COPYING

Lines changed: 5 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,108 +1006,12 @@ available in the public domain.
10061006

10071007
Portions of the OpenSSL headers are included under the OpenSSL license:
10081008

1009-
Copyright (C) 1995-1998 Eric Young ([email protected])
1010-
All rights reserved.
1011-
1012-
This package is an SSL implementation written
1013-
by Eric Young ([email protected]).
1014-
The implementation was written so as to conform with Netscapes SSL.
1015-
1016-
This library is free for commercial and non-commercial use as long as
1017-
the following conditions are aheared to. The following conditions
1018-
apply to all code found in this distribution, be it the RC4, RSA,
1019-
lhash, DES, etc., code; not just the SSL code. The SSL documentation
1020-
included with this distribution is covered by the same copyright terms
1021-
except that the holder is Tim Hudson ([email protected]).
1022-
1023-
Copyright remains Eric Young's, and as such any Copyright notices in
1024-
the code are not to be removed.
1025-
If this package is used in a product, Eric Young should be given attribution
1026-
as the author of the parts of the library used.
1027-
This can be in the form of a textual message at program startup or
1028-
in documentation (online or textual) provided with the package.
1029-
1030-
Redistribution and use in source and binary forms, with or without
1031-
modification, are permitted provided that the following conditions
1032-
are met:
1033-
1. Redistributions of source code must retain the copyright
1034-
notice, this list of conditions and the following disclaimer.
1035-
2. Redistributions in binary form must reproduce the above copyright
1036-
notice, this list of conditions and the following disclaimer in the
1037-
documentation and/or other materials provided with the distribution.
1038-
3. All advertising materials mentioning features or use of this software
1039-
must display the following acknowledgement:
1040-
"This product includes cryptographic software written by
1041-
Eric Young ([email protected])"
1042-
The word 'cryptographic' can be left out if the rouines from the library
1043-
being used are not cryptographic related :-).
1044-
4. If you include any Windows specific code (or a derivative thereof) from
1045-
the apps directory (application code) you must include an acknowledgement:
1046-
"This product includes software written by Tim Hudson ([email protected])"
1047-
1048-
THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
1049-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1050-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1051-
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
1052-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1053-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
1054-
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
1055-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1056-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1057-
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
1058-
SUCH DAMAGE.
1059-
1060-
The licence and distribution terms for any publically available version or
1061-
derivative of this code cannot be changed. i.e. this code cannot simply be
1062-
copied and put under another distribution licence
1063-
[including the GNU Public Licence.]
1064-
1065-
====================================================================
1066-
Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
1067-
1068-
Redistribution and use in source and binary forms, with or without
1069-
modification, are permitted provided that the following conditions
1070-
are met:
1071-
1072-
1. Redistributions of source code must retain the above copyright
1073-
notice, this list of conditions and the following disclaimer.
1074-
1075-
2. Redistributions in binary form must reproduce the above copyright
1076-
notice, this list of conditions and the following disclaimer in
1077-
the documentation and/or other materials provided with the
1078-
distribution.
1079-
1080-
3. All advertising materials mentioning features or use of this
1081-
software must display the following acknowledgment:
1082-
"This product includes software developed by the OpenSSL Project
1083-
for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
1084-
1085-
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
1086-
endorse or promote products derived from this software without
1087-
prior written permission. For written permission, please contact
1088-
1009+
Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
10891010

1090-
5. Products derived from this software may not be called "OpenSSL"
1091-
nor may "OpenSSL" appear in their names without prior written
1092-
permission of the OpenSSL Project.
1093-
1094-
6. Redistributions of any form whatsoever must retain the following
1095-
acknowledgment:
1096-
"This product includes software developed by the OpenSSL Project
1097-
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
1098-
1099-
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
1100-
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1101-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1102-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
1103-
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1104-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1105-
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
1106-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
1107-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
1108-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
1109-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
1110-
OF THE POSSIBILITY OF SUCH DAMAGE.
1011+
Licensed under the Apache License 2.0 (the "License"). You may not use
1012+
this file except in compliance with the License. You can obtain a copy
1013+
in the file LICENSE in the source distribution or at
1014+
https://www.openssl.org/source/license.html
11111015

11121016
----------------------------------------------------------------------
11131017

src/libgit2/streams/openssl_dynamic.h

Lines changed: 2 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -5,152 +5,13 @@
55
* a Linking Exception. For full terms see the included COPYING file.
66
*/
77

8-
/* Copyright (C) 1995-1998 Eric Young ([email protected])
9-
* All rights reserved.
10-
*
11-
* This package is an SSL implementation written
12-
* by Eric Young ([email protected]).
13-
* The implementation was written so as to conform with Netscapes SSL.
14-
*
15-
* This library is free for commercial and non-commercial use as long as
16-
* the following conditions are adhered to. The following conditions
17-
* apply to all code found in this distribution, be it the RC4, RSA,
18-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
19-
* included with this distribution is covered by the same copyright terms
20-
* except that the holder is Tim Hudson ([email protected]).
21-
*
22-
* Copyright remains Eric Young's, and as such any Copyright notices in
23-
* the code are not to be removed.
24-
* If this package is used in a product, Eric Young should be given attribution
25-
* as the author of the parts of the library used.
26-
* This can be in the form of a textual message at program startup or
27-
* in documentation (online or textual) provided with the package.
28-
*
29-
* Redistribution and use in source and binary forms, with or without
30-
* modification, are permitted provided that the following conditions
31-
* are met:
32-
* 1. Redistributions of source code must retain the copyright
33-
* notice, this list of conditions and the following disclaimer.
34-
* 2. Redistributions in binary form must reproduce the above copyright
35-
* notice, this list of conditions and the following disclaimer in the
36-
* documentation and/or other materials provided with the distribution.
37-
* 3. All advertising materials mentioning features or use of this software
38-
* must display the following acknowledgement:
39-
* "This product includes cryptographic software written by
40-
* Eric Young ([email protected])"
41-
* The word 'cryptographic' can be left out if the routines from the library
42-
* being used are not cryptographic related :-).
43-
* 4. If you include any Windows specific code (or a derivative thereof) from
44-
* the apps directory (application code) you must include an acknowledgement:
45-
* "This product includes software written by Tim Hudson ([email protected])"
46-
*
47-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
48-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
49-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
50-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
51-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
52-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
53-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
55-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
56-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
57-
* SUCH DAMAGE.
58-
*
59-
* The licence and distribution terms for any publicly available version or
60-
* derivative of this code cannot be changed. i.e. this code cannot simply be
61-
* copied and put under another distribution licence
62-
* [including the GNU Public Licence.]
63-
*/
64-
/* ====================================================================
65-
* Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
66-
*
67-
* Redistribution and use in source and binary forms, with or without
68-
* modification, are permitted provided that the following conditions
69-
* are met:
70-
*
71-
* 1. Redistributions of source code must retain the above copyright
72-
* notice, this list of conditions and the following disclaimer.
73-
*
74-
* 2. Redistributions in binary form must reproduce the above copyright
75-
* notice, this list of conditions and the following disclaimer in
76-
* the documentation and/or other materials provided with the
77-
* distribution.
78-
*
79-
* 3. All advertising materials mentioning features or use of this
80-
* software must display the following acknowledgment:
81-
* "This product includes software developed by the OpenSSL Project
82-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
83-
*
84-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
85-
* endorse or promote products derived from this software without
86-
* prior written permission. For written permission, please contact
87-
88-
*
89-
* 5. Products derived from this software may not be called "OpenSSL"
90-
* nor may "OpenSSL" appear in their names without prior written
91-
* permission of the OpenSSL Project.
92-
*
93-
* 6. Redistributions of any form whatsoever must retain the following
94-
* acknowledgment:
95-
* "This product includes software developed by the OpenSSL Project
96-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
97-
*
98-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
99-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
100-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
101-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
102-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
103-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
104-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
105-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
106-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
107-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
108-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
109-
* OF THE POSSIBILITY OF SUCH DAMAGE.
110-
* ====================================================================
111-
*
112-
* This product includes cryptographic software written by Eric Young
113-
* ([email protected]). This product includes software written by Tim
114-
* Hudson ([email protected]).
115-
*
116-
*/
117-
/* ====================================================================
118-
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
119-
* ECC cipher suite support in OpenSSL originally developed by
120-
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
121-
*/
122-
/* ====================================================================
123-
* Copyright 2005 Nokia. All rights reserved.
124-
*
125-
* The portions of the attached software ("Contribution") is developed by
126-
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
127-
* license.
128-
*
129-
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
130-
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
131-
* support (see RFC 4279) to OpenSSL.
132-
*
133-
* No patent licenses or other rights except those expressly stated in
134-
* the OpenSSL open source license shall be deemed granted or received
135-
* expressly, by implication, estoppel, or otherwise.
136-
*
137-
* No assurances are provided by Nokia that the Contribution does not
138-
* infringe the patent or other intellectual property rights of any third
139-
* party or that the license provides you with all the necessary rights
140-
* to make use of the Contribution.
141-
*
142-
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
143-
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
144-
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
145-
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
146-
* OTHERWISE.
147-
*/
148-
1498
#ifndef INCLUDE_streams_openssl_dynamic_h__
1509
#define INCLUDE_streams_openssl_dynamic_h__
15110

15211
#ifdef GIT_HTTPS_OPENSSL_DYNAMIC
15312

13+
/* These constants are taken from the OpenSSL 3.0 headers. */
14+
15415
# define BIO_CTRL_FLUSH 11
15516

15617
# define BIO_TYPE_SOURCE_SINK 0x0400

0 commit comments

Comments
 (0)