[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.11 and 1.11.2.2

version 1.11, 2003/02/12 21:39:50 version 1.11.2.2, 2004/03/04 18:18:14
Line 45 
Line 45 
     software are publicly available on the Internet and at any major      software are publicly available on the Internet and at any major
     bookstore, scientific library, and patent office worldwide.  More      bookstore, scientific library, and patent office worldwide.  More
     information can be found e.g. at "http://www.cs.hut.fi/crypto".      information can be found e.g. at "http://www.cs.hut.fi/crypto".
   
     The legal status of this program is some combination of all these      The legal status of this program is some combination of all these
     permissions and restrictions.  Use only at your own responsibility.      permissions and restrictions.  Use only at your own responsibility.
     You will be responsible for any legal consequences yourself; I am not      You will be responsible for any legal consequences yourself; I am not
     making any claims whether possessing or using this is legal or not in      making any claims whether possessing or using this is legal or not in
     your country, and I am not taking any responsibility on your behalf.      your country, and I am not taking any responsibility on your behalf.
   
   
                             NO WARRANTY                              NO WARRANTY
   
     BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY      BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
     FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN      FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
     OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES      OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
Line 64 
Line 64 
     TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE      TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,      PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
     REPAIR OR CORRECTION.      REPAIR OR CORRECTION.
   
     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING      IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
     WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR      WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
     REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,      REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
Line 112 
Line 112 
     with the following license:      with the following license:
   
      * @version 3.0 (December 2000)       * @version 3.0 (December 2000)
      *       *
      * Optimised ANSI C code for the Rijndael cipher (now AES)       * Optimised ANSI C code for the Rijndael cipher (now AES)
      *       *
      * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>       * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
      * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>       * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
      * @author Paulo Barreto <paulo.barreto@terra.com.br>       * @author Paulo Barreto <paulo.barreto@terra.com.br>
      *       *
      * This code is hereby placed in the public domain.       * This code is hereby placed in the public domain.
      *       *
      * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS       * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
      * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED       * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
      * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE       * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
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 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 151 
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 183 
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 204 
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.11  
changed lines
  Added in v.1.11.2.2