From 033e4557c0a0944d9e96fa8c1577eabe0aa44eda Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 18 Sep 2001 05:36:27 +0000 Subject: - (bal) LICENCE update. Has not been done in a while. --- LICENCE | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'LICENCE') diff --git a/LICENCE b/LICENCE index f60f5020..170e2276 100644 --- a/LICENCE +++ b/LICENCE @@ -26,7 +26,7 @@ OpenSSH contains no GPL code. [However, none of that term is relevant at this point in time. All of these restrictively licenced software components which he talks about - have been removed from OpenSSH, ie. + have been removed from OpenSSH, i.e., - RSA is no longer included, found in the OpenSSL library - IDEA is no longer included, its use is deprecated @@ -85,8 +85,7 @@ OpenSSH contains no GPL code. 3) The 32-bit CRC compensation attack detector in deattack.c was - contributed by CORE SDI S.A. under a BSD-style license. See - http://www.core-sdi.com/english/ssh/ for details. + contributed by CORE SDI S.A. under a BSD-style license. * Cryptographic attack detector for ssh - source code * @@ -104,8 +103,38 @@ OpenSSH contains no GPL code. * * Ariel Futoransky * - + 4) + ssh-keygen was contributed by David Mazieres under a BSD-style + license. + + * Copyright 1995, 1996 by David Mazieres . + * + * Modification and redistribution in source and binary forms is + * permitted provided that due credit is given to the author and the + * OpenBSD project by leaving this copyright notice intact. + +5) + The Rijndael implementation is from Dr Brian Gladman and is + provided under a BSD-style license. + + Copyright (c) 2001 Dr Brian Gladman , Worcester, UK + + TERMS + + 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 'as is' with no guarantees of correctness or + fitness for purpose. + +6) Remaining components of the software are provided under a standard 2-term BSD licence with the following names as copyright holders: @@ -114,6 +143,8 @@ OpenSSH contains no GPL code. Niels Provos Dug Song Aaron Campbell + Damien Miller + Kevin Steves * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- cgit v1.2.3