Skip to content

Commit d57348c

Browse files
committed
Merged in Upstream
2 parents a6288a6 + 2b583c6 commit d57348c

File tree

3 files changed

+43
-0
lines changed

3 files changed

+43
-0
lines changed

LICENSE-IndyBSD

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Indy Modified BSD License
2+
3+
Copyright
4+
5+
Portions of this software are Copyright (c) 1993 - 2018, Chad Z. Hower (Kudzu) and the Indy Pit Crew - http://www.IndyProject.org/
6+
7+
License
8+
9+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
10+
11+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
12+
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation, about box and/or other materials provided with the distribution.
13+
No personal names or organizations names associated with the Indy project may be used to endorse or promote products derived from this software without specific prior written permission of the specific individual or organization.
14+
15+
THIS SOFTWARE IS PROVIDED BY Chad Z. Hower (Kudzu) and the Indy Pit Crew "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Dual Licensed
2+
3+
Indy is dual licensed. You can review which license better suits your needs, and use that license. You can even change your mind later if you have previously chosen one.
4+
5+
## Licenses
6+
7+
1. Indy Modified BSD License - The Indy Modified BSD license is a very no nonsense license that allows you to do almost anything you want with Indy, provided you provide proper attribution.
8+
9+
3. Indy MPL (Mozilla Public License) License - To make it easier and consistent for JEDI users, we also offer an [MPL license v1.1](http://www.mozilla.org/MPL/MPL-1.1.html).
10+
11+
## Which license should I use?
12+
13+
You need to investigate them and see which one fits your needs. The BSD license is simpler and allows much broader use, but requires attribution (See below). The MPL license is more restrictive, but does not require attribution. If in doubt, choose the BSD license and just provide proper attribution.
14+
15+
## Do I have to provide attribution in the about box?
16+
17+
No. While we appreciate attribution in the about box, it is not a requirement. A mention in the documentation (or in multiple places), or any reasonable visible place to the users of the product is acceptable. There are also Indy graphics and logos you can use. (https://www.indyproject.org/license/logos)

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Indy TLS for OpenSSL
2+
23
This project implements TLS and Hash functionalities for Indy using OpenSSL as the backend library.
34

45
This fork is the basis of a change request to the original repo and should be ignored by most users.
@@ -125,7 +126,17 @@ Usage: fpc_openssl_client [-h] [-n] [-l <cacerts dir>] [-L] [OpenSSL lib dir]
125126

126127

127128

129+
Upstream README.MD
130+
=================
131+
132+
Once this project is stable, the corresponding files will be removed from Indy's main Protocols package, the USE_OPENSSL conditional will be removed from Indy's source files, etc. This requires Indy 10.7 or later, otherwise it will conflict with the OpenSSL files thaat are present in older Indy versions.
133+
134+
Not sure at this time whether this project will stay as an independant repo, or if it will eventually be merged back into the main Indy repo as a sub-folder. But either way, this project will stay as a separate package moving forward.
128135

136+
## License
129137

138+
This project is dual-licensed under the terms of the Indy Modified BSD License and Indy MPL License.
139+
You can choose between one of them if you use this work.
130140

141+
SPDX-License-Identifier: LicenseRef-IndyBSD OR MPL-1.1
131142

0 commit comments

Comments
 (0)