[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.5 and 1.5.2.3

version 1.5, 2001/09/23 09:58:13 version 1.5.2.3, 2002/06/22 07:23:16
Line 140 
Line 140 
      * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE       * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
      * 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)  6)
       One component of the ssh source code is under a 4-clause BSD license,
       held by the University of California, since we pulled these parts from
       original Berkeley code.  The Regents of the University of California
       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
        *      The Regents of the University of California.  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. All advertising materials mentioning features or use of this software
        *    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
        *    without specific prior written permission.
        *
        * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
   
   7)
     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 152 
Line 190 
         Aaron Campbell          Aaron Campbell
         Damien Miller          Damien Miller
         Kevin Steves          Kevin Steves
           Daniel Kouril
           Per Allansson
   
      * 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
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.5.2.3