From 085b6de6fccaa5d94207174e21770634e5e140f9 Mon Sep 17 00:00:00 2001 From: Skelsec Date: Wed, 29 Nov 2023 23:33:46 +0100 Subject: [PATCH] upping license for the extra pac parsing code --- LICENSE | 65 ++++++++++++++++++++++++++++++++++ minikerberos/common/factory.py | 2 +- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ae3a7e1..562b94c 100644 --- a/LICENSE +++ b/LICENSE @@ -19,3 +19,68 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + + + +PAC parsing code in /protocol/external/* is taken from Impacket. License as follows: +--------- + +We provide this software under a slightly modified version of the +Apache Software License. The only changes to the document were the +replacement of "Apache" with "Impacket" and "Apache Software Foundation" +with "Fortra". Feel free to compare the resulting +document to the official Apache license. + +The `Apache Software License' is an Open Source Initiative Approved +License. + + +The Apache Software License, Version 1.1 +Modifications by Fortra (see above) + +Copyright (c) 2000 The Apache Software Foundation. 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. + +3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by + SecureAuth Corporation (https://www.secureauth.com/) and Fortra (https://www.fortra.com)." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + +4. The names "Impacket", "SecureAuth Corporation", and "Fortra" must + not be used to endorse or promote products derived from this + software without prior written permission. For written + permission, please reach out to https://www.coresecurity.com/about/contact. + +5. Products derived from this software may not be called "Impacket", + nor may "Impacket" appear in their name, without prior written + permission of Fortra. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR +ITS 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. + diff --git a/minikerberos/common/factory.py b/minikerberos/common/factory.py index 48ba48c..8fbb0ee 100644 --- a/minikerberos/common/factory.py +++ b/minikerberos/common/factory.py @@ -98,7 +98,7 @@ def get_target(self): def get_creds(self): if self.credential is not None: return copy.deepcopy(self.credential) - + if self.secret_type == KerberosSecretType.KEYTAB: return KerberosCredential.from_keytab(self.secret, self.username, self.domain) if self.secret_type == KerberosSecretType.KIRBI: