From bffa1cb7f6071f972fe506b50a48212efcd2f57f Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sun, 23 Sep 2001 13:58:38 +0000 Subject: - markus@cvs.openbsd.org 2001/09/23 09:58:13 [LICENCE] new rijndael implementation --- ChangeLog | 5 ++++- LICENCE | 43 +++++++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71d555cdf..967908659 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ - markus@cvs.openbsd.org 2001/09/23 11:09:13 [authfile.c] relax permission check for private key files. + - markus@cvs.openbsd.org 2001/09/23 09:58:13 + [LICENCE] + new rijndael implementation 20010920 - (tim) [scard/Makefile.in] Don't strip the Java binary @@ -6554,4 +6557,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1555 2001/09/23 13:54:57 mouring Exp $ +$Id: ChangeLog,v 1.1556 2001/09/23 13:58:38 mouring Exp $ diff --git a/LICENCE b/LICENCE index 170e2276d..b229fcdf6 100644 --- a/LICENCE +++ b/LICENCE @@ -115,24 +115,31 @@ OpenSSH contains no GPL code. * OpenBSD project by leaving this copyright notice intact. 5) - The Rijndael implementation is from Dr Brian Gladman and is - provided under a BSD-style license. - - Copyright (c) 2001 Dr Brian Gladman , Worcester, UK - - TERMS - - 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. - - This software is provided 'as is' with no guarantees of correctness or - fitness for purpose. + 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 + * @author Antoon Bosselaers + * @author Paulo Barreto + * + * 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) Remaining components of the software are provided under a standard -- cgit v1.2.3