From 8374e2f01f13967a3313624cd5db8e499d9ad3c0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 7 Feb 2018 16:06:53 +0000 Subject: [PATCH] Add license notes about OpenSSL distribution --- docs/credits_acknowledgements.rst | 4 ++++ scripts/installer/LICENSE.rtf | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/credits_acknowledgements.rst b/docs/credits_acknowledgements.rst index 80bc21df6..2d90368fa 100644 --- a/docs/credits_acknowledgements.rst +++ b/docs/credits_acknowledgements.rst @@ -120,6 +120,10 @@ The following libraries and components are incorporated into RenderDoc, listed h Used to support interceptor-lib to inject hooks into android library functions. +* `OpenSSL `_ - Copyright (c) 1998-2018 The OpenSSL Project. Copyright (C) 1995-1998 Eric Young. Distributed under the double license of the OpenSSL and SSLeay licenses. + + Used to connect securely to RenderDoc's servers for update checks and bug reports. + Thanks ------ diff --git a/scripts/installer/LICENSE.rtf b/scripts/installer/LICENSE.rtf index 670d9bb56..e135b3996 100644 --- a/scripts/installer/LICENSE.rtf +++ b/scripts/installer/LICENSE.rtf @@ -38,6 +38,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI {\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}https://pugixml.org"}}{\fldrslt{\ul\cf1 https://pugixml.org}}}\f0\fs22\line pugixml distributed under the MIT License. Copyright (c) 2006-2017 Arseny Kapoulkine.\par {\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}https://source.android.com"}}{\fldrslt{\ul\cf1 https://source.android.com}}}\f0\fs22\line components of AOSP distributed under the Apache 2.0 License. Copyright (c) 2006-2016 The Android Open Source Project.\par {\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}https://github.com/google/gapid"}}{\fldrslt{\ul\cf1 https://github.com/google/gapid}}}\f0\fs22\line interceptor-lib distributed under the Apache 2.0 License. Copyright (c) 2017, Google Inc.\par -{\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}http://llvm.org"}}{\fldrslt{\ul\cf1 https://source.android.com}}}\f0\fs22\line LLVM distributed under the University of Illinois/NCSA Open Source License. Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.\par +{\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}http://llvm.org"}}{\fldrslt{\ul\cf1 http://llvm.org}}}\f0\fs22\line LLVM distributed under the University of Illinois/NCSA Open Source License. Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.\par +{\field{\*\fldinst{HYPERLINK "{\pntext\f1\'B7\tab}https://www.openssl.org/"}}{\fldrslt{\ul\cf1 https://www.openssl.org}}}\f0\fs22\line OpenSSL distributed under the double license of the OpenSSL and SSLeay licenses. Copyright (c) 1998-2018 The OpenSSL Project. Copyright (C) 1995-1998 Eric Young.\par }