[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.2.2 and 1.11

version 1.10.2.2, 2003/09/16 21:20:23 version 1.11, 2003/02/12 21:39:50
Line 134 
Line 134 
      * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.       * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   
 5)  5)
     One component of the ssh source code is under a 3-clause BSD license,      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      held by the University of California, since we pulled these parts from
     original Berkeley code.      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       * 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 149 
Line 151 
      * 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. Neither the name of the University nor the names of its contributors       * 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       *    may be used to endorse or promote products derived from this software
      *    without specific prior written permission.       *    without specific prior written permission.
      *       *
Line 177 
Line 183 
         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 201 
Line 204 
      * 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.2.2  
changed lines
  Added in v.1.11