[BACK]Return to LICENCE CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/LICENCE between version 1.10 and 1.10.2.2

version 1.10, 2002/05/25 20:40:08 version 1.10.2.2, 2003/09/16 21:20:23
Line 76 
Line 76 
     POSSIBILITY OF SUCH DAMAGES.      POSSIBILITY OF SUCH DAMAGES.
   
 2)  2)
     The 32-bit CRC implementation in crc32.c is due to Gary S. Brown.  
     Comments in the file indicate it may be used for any purpose without  
     restrictions:  
   
      * COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or  
      * code or tables extracted from it, as desired without restriction.  
   
 3)  
     The 32-bit CRC compensation attack detector in deattack.c was      The 32-bit CRC compensation attack detector in deattack.c was
     contributed by CORE SDI S.A. under a BSD-style license.      contributed by CORE SDI S.A. under a BSD-style license.
   
Line 104 
Line 96 
      * Ariel Futoransky <futo@core-sdi.com>       * Ariel Futoransky <futo@core-sdi.com>
      * <http://www.core-sdi.com>       * <http://www.core-sdi.com>
   
 4)  3)
     ssh-keygen was contributed by David Mazieres under a BSD-style      ssh-keygen was contributed by David Mazieres under a BSD-style
     license.      license.
   
Line 114 
Line 106 
      * permitted provided that due credit is given to the author and the       * permitted provided that due credit is given to the author and the
      * OpenBSD project by leaving this copyright notice intact.       * OpenBSD project by leaving this copyright notice intact.
   
 5)  4)
     The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers      The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers
     and Paulo Barreto is in the public domain and distributed      and Paulo Barreto is in the public domain and distributed
     with the following license:      with the following license:
Line 141 
Line 133 
      * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,       * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
      * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.       * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   
 6)  5)
     One component of the ssh source code is under a 4-clause BSD license,      One component of the ssh source code is under a 3-clause BSD license,
     held by the University of California, since we pulled these parts from      held by the University of California, since we pulled these parts from
     original Berkeley code.  The Regents of the University of California      original Berkeley code.
     have declared that term 3 is no longer enforceable on their source code,  
     but we retain that license as is.  
   
      * Copyright (c) 1983, 1990, 1992, 1993, 1995       * Copyright (c) 1983, 1990, 1992, 1993, 1995
      *      The Regents of the University of California.  All rights reserved.       *      The Regents of the University of California.  All rights reserved.
Line 159 
Line 149 
      * 2. Redistributions in binary form must reproduce the above copyright       * 2. Redistributions in binary form must reproduce the above copyright
      *    notice, this list of conditions and the following disclaimer in the       *    notice, this list of conditions and the following disclaimer in the
      *    documentation and/or other materials provided with the distribution.       *    documentation and/or other materials provided with the distribution.
      * 3. All advertising materials mentioning features or use of this software       * 3. Neither the name of the University nor the names of its contributors
      *    must display the following acknowledgement:  
      *      This product includes software developed by the University of  
      *      California, Berkeley and its contributors.  
      * 4. Neither the name of the University nor the names of its contributors  
      *    may be used to endorse or promote products derived from this software       *    may be used to endorse or promote products derived from this software
      *    without specific prior written permission.       *    without specific prior written permission.
      *       *
Line 179 
Line 165 
      * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF       * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
      * SUCH DAMAGE.       * SUCH DAMAGE.
   
 7)  6)
     Remaining components of the software are provided under a standard      Remaining components of the software are provided under a standard
     2-term BSD licence with the following names as copyright holders:      2-term BSD licence with the following names as copyright holders:
   
Line 191 
Line 177 
         Damien Miller          Damien Miller
         Kevin Steves          Kevin Steves
         Daniel Kouril          Daniel Kouril
           Wesley Griffin
         Per Allansson          Per Allansson
           Nils Nordman
           Simon Wilkinson
   
      * Redistribution and use in source and binary forms, with or without       * Redistribution and use in source and binary forms, with or without
      * modification, are permitted provided that the following conditions       * modification, are permitted provided that the following conditions
Line 212 
Line 201 
      * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT       * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
      * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF       * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
      * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.       * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   
   ------
   $OpenBSD$
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.10.2.2