mirror of https://github.com/sonertari/SSLproxy
Update with SSLsplit 0.5.2 and develop branch changes as of 270218
Soner Tari
6 years ago
parent
ae69b21908
commit
9d435e180c
@ -1,48 +0,0 @@
|
|||||||
# Development
|
|
||||||
|
|
||||||
SSLsplit is being developed on Github as [droe/sslsplit][1] and uses
|
|
||||||
TravisCI for continuous integration.
|
|
||||||
[](https://travis-ci.org/droe/sslsplit)
|
|
||||||
|
|
||||||
[1]: https://github.com/droe/sslsplit
|
|
||||||
|
|
||||||
## Reporting bugs
|
|
||||||
|
|
||||||
Please use the Github issue tracker for bug reports. Before submitting a bug
|
|
||||||
report, please check whether the bug is also present in the `develop` branch
|
|
||||||
and whether running `make test` produces failed unit tests on your system.
|
|
||||||
|
|
||||||
|
|
||||||
## Contributing patches
|
|
||||||
|
|
||||||
For patch submissions, please send me pull requests on Github. Ideally, you
|
|
||||||
fork a separate feature branch off the latest `develop` branch for each of
|
|
||||||
your contributions (see below). If you have larger changes in mind, feel
|
|
||||||
free to open an issue first to discuss implications.
|
|
||||||
|
|
||||||
If you are interested in contributing and don't know where to start, take a
|
|
||||||
look at the [open issues][2]. In particular, [porting features over to not
|
|
||||||
yet supported platforms][3] is always very much appreciated. When submitting
|
|
||||||
code, even though it is not a requirement, it is still appreciated if you
|
|
||||||
also update the manual page and other documentation as necessary and include
|
|
||||||
as many meaningful unit tests for your code as possible.
|
|
||||||
|
|
||||||
[2]: https://github.com/droe/sslsplit/issues
|
|
||||||
[3]: https://github.com/droe/sslsplit/labels/portability
|
|
||||||
|
|
||||||
See `LICENSE.md` for licensing and copyright information applying to
|
|
||||||
contributions. See `AUTHORS.md` for the list of contributors.
|
|
||||||
|
|
||||||
|
|
||||||
## Branching model
|
|
||||||
|
|
||||||
With the 0.4.10 release as a starting point, SSLsplit is using [Vincent
|
|
||||||
Driessen's branching model][4]. The default `master` branch points to the
|
|
||||||
latest tagged release, while the `develop` branch is where development happens.
|
|
||||||
When preparing a release, there may or may not be a `release/x.y.z` branch off
|
|
||||||
`develop`, but in either case, the tagged release is merged back to `master`.
|
|
||||||
New features are developed in feature branches off the `develop` branch.
|
|
||||||
|
|
||||||
[4]: http://nvie.com/posts/a-successful-git-branching-model/
|
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
BSD 2-Clause License
|
||||||
|
|
||||||
|
Copyright (c) 2009-2018, Daniel Roethlisberger and contributors.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
1. Redistributions of source code must retain the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer.
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``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 COPYRIGHT HOLDER 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.
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
By contributing to the software, the contributor releases their contribution
|
||||||
|
under the copyright and license terms of this software. While contributors
|
||||||
|
retain copyright to their contributions, they grant the main copyright holder
|
||||||
|
of the software the irrevocable, transferable right to relicense the software
|
||||||
|
as a whole or in part, including their contributions, under different open
|
||||||
|
source licenses than the one currently used.
|
||||||
|
|
||||||
|
Third-party components included as documented in `LICENSE.third` and the
|
||||||
|
respective source files do not constitute contribution in this sense and retain
|
||||||
|
their original copyright and license terms.
|
||||||
@ -1,64 +0,0 @@
|
|||||||
# License and copyright
|
|
||||||
|
|
||||||
## Copyright
|
|
||||||
|
|
||||||
Copyright (c) 2009-2016, Daniel Roethlisberger and contributors.
|
|
||||||
All rights reserved.
|
|
||||||
Licensed under the 2-clause BSD license contained herein.
|
|
||||||
|
|
||||||
|
|
||||||
## Third-party components
|
|
||||||
|
|
||||||
`khash.h`:
|
|
||||||
Copyright (c) 2008, 2009, 2011, Attractive Chaos.
|
|
||||||
All rights reserved.
|
|
||||||
Licensed under the MIT license.
|
|
||||||
|
|
||||||
`xnu/xnu-*`:
|
|
||||||
Copyright (c) 1988-2015, Apple Inc. and original copyright holders.
|
|
||||||
All rights reserved.
|
|
||||||
Licensed under the APSL.
|
|
||||||
|
|
||||||
`extra/log*.py`:
|
|
||||||
Copyright (C) 2015, Maciej Kotowicz and Daniel Roethlisberger.
|
|
||||||
All rights reserved.
|
|
||||||
Licensed under a 2-clause BSD license.
|
|
||||||
|
|
||||||
See the respective source and/or license files for details.
|
|
||||||
|
|
||||||
|
|
||||||
## Contributions
|
|
||||||
|
|
||||||
By contributing to the software, the contributor releases their
|
|
||||||
contribution under the license and copyright terms herein. While
|
|
||||||
contributors retain copyright to their contributions, they grant the
|
|
||||||
main copyright holder of the software the irrevocable, transferable
|
|
||||||
right to relicense the software as a whole or in part, including their
|
|
||||||
contributions, under different open source licenses than the one
|
|
||||||
contained herein.
|
|
||||||
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions, and the following disclaimer.
|
|
||||||
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
|
|
||||||
|
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
The software includes the following third-party source code components with
|
||||||
|
different copyright and license terms:
|
||||||
|
|
||||||
|
khash.h:
|
||||||
|
|
||||||
|
Copyright (c) 2008, 2009, 2011, Attractive Chaos.
|
||||||
|
All rights reserved.
|
||||||
|
Licensed under the MIT license.
|
||||||
|
|
||||||
|
xnu/xnu-*:
|
||||||
|
|
||||||
|
Copyright (c) 1988-2017, Apple Inc. and original copyright holders.
|
||||||
|
All rights reserved.
|
||||||
|
Licensed under the APSL.
|
||||||
|
|
||||||
|
extra/log*.py:
|
||||||
|
|
||||||
|
Copyright (C) 2015, Maciej Kotowicz and Daniel Roethlisberger.
|
||||||
|
All rights reserved.
|
||||||
|
Licensed under a 2-clause BSD license.
|
||||||
|
|
||||||
|
See the respective source and/or license files for details.
|
||||||
Loading…
Reference in New Issue