[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.3.2.3 and 1.4

version 1.3.2.3, 2002/06/02 22:56:09 version 1.4, 2001/07/30 16:28:53
Line 115 
Line 115 
      * OpenBSD project by leaving this copyright notice intact.       * OpenBSD project by leaving this copyright notice intact.
   
 5)  5)
     The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers      The Rijndael implementation is from Dr Brian Gladman and is
     and Paulo Barreto is in the public domain and distributed      provided under a BSD-style license.
     with the following license:  
   
      * @version 3.0 (December 2000)      Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK
      *  
      * Optimised ANSI C code for the Rijndael cipher (now AES)      TERMS
      *  
      * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>  
      * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>  
      * @author Paulo Barreto <paulo.barreto@terra.com.br>  
      *  
      * This code is hereby placed in the public domain.  
      *  
      * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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.  
   
 6)      Redistribution and use in source and binary forms, with or without
     One component of the ssh source code is under a 4-clause BSD license,      modification, are permitted provided that the following conditions
     held by the University of California, since we pulled these parts from      are met:
     original Berkeley code.  The Regents of the University of California      1. Redistributions of source code must retain the above copyright
     have declared that term 3 is no longer enforceable on their source code,         notice, this list of conditions and the following disclaimer.
     but we retain that license as is.      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.
   
      * Copyright (c) 1983, 1990, 1992, 1993, 1995      This software is provided 'as is' with no guarantees of correctness or
      *      The Regents of the University of California.  All rights reserved.      fitness for purpose.
      *  
      * Redistribution and use in source and binary forms, with or without  6)
      * 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 190 
Line 145 
         Aaron Campbell          Aaron Campbell
         Damien Miller          Damien Miller
         Kevin Steves          Kevin Steves
         Daniel Kouril  
   
      * 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.3.2.3  
changed lines
  Added in v.1.4