[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.2.2.3 and 1.3

version 1.2.2.3, 2002/03/08 17:04:41 version 1.3, 2001/02/11 13:15:56
Line 26 
Line 26 
   
     [However, none of that term is relevant at this point in time.  All of      [However, none of that term is relevant at this point in time.  All of
     these restrictively licenced software components which he talks about      these restrictively licenced software components which he talks about
     have been removed from OpenSSH, i.e.,      have been removed from OpenSSH, ie.
   
      - RSA is no longer included, found in the OpenSSL library       - RSA is no longer included, found in the OpenSSL library
      - IDEA is no longer included, its use is deprecated       - IDEA is no longer included, its use is deprecated
Line 85 
Line 85 
   
 3)  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. See
       http://www.core-sdi.com/english/ssh/ for details.
   
      * Cryptographic attack detector for ssh - source code       * Cryptographic attack detector for ssh - source code
      *       *
Line 103 
Line 104 
      *       *
      * Ariel Futoransky <futo@core-sdi.com>       * Ariel Futoransky <futo@core-sdi.com>
      * <http://www.core-sdi.com>       * <http://www.core-sdi.com>
   
 4)  4)
     ssh-keygen was contributed by David Mazieres under a BSD-style  
     license.  
   
      * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.  
      *  
      * Modification and redistribution in source and binary forms is  
      * permitted provided that due credit is given to the author and the  
      * OpenBSD project by leaving this copyright notice intact.  
   
 5)  
     The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers  
     and Paulo Barreto is in the public domain and distributed  
     with the following license:  
   
      * @version 3.0 (December 2000)  
      *  
      * Optimised ANSI C code for the Rijndael cipher (now AES)  
      *  
      * @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)  
     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 188 
Line 114 
         Niels Provos          Niels Provos
         Dug Song          Dug Song
         Aaron Campbell          Aaron Campbell
         Damien Miller  
         Kevin Steves  
   
      * 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.2.2.3  
changed lines
  Added in v.1.3