diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-23 13:58:38 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-23 13:58:38 +0000 |
commit | bffa1cb7f6071f972fe506b50a48212efcd2f57f (patch) | |
tree | dc85ee2f5244e415c9b7d3638ef9fa5964ad00d7 | |
parent | b85544d717f82e466e55cd6acd158bf1dd109b33 (diff) |
- markus@cvs.openbsd.org 2001/09/23 09:58:13
[LICENCE]
new rijndael implementation
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | LICENCE | 43 |
2 files changed, 29 insertions, 19 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/09/23 11:09:13 | 3 | - markus@cvs.openbsd.org 2001/09/23 11:09:13 |
4 | [authfile.c] | 4 | [authfile.c] |
5 | relax permission check for private key files. | 5 | relax permission check for private key files. |
6 | - markus@cvs.openbsd.org 2001/09/23 09:58:13 | ||
7 | [LICENCE] | ||
8 | new rijndael implementation | ||
6 | 9 | ||
7 | 20010920 | 10 | 20010920 |
8 | - (tim) [scard/Makefile.in] Don't strip the Java binary | 11 | - (tim) [scard/Makefile.in] Don't strip the Java binary |
@@ -6554,4 +6557,4 @@ | |||
6554 | - Wrote replacements for strlcpy and mkdtemp | 6557 | - Wrote replacements for strlcpy and mkdtemp |
6555 | - Released 1.0pre1 | 6558 | - Released 1.0pre1 |
6556 | 6559 | ||
6557 | $Id: ChangeLog,v 1.1555 2001/09/23 13:54:57 mouring Exp $ | 6560 | $Id: ChangeLog,v 1.1556 2001/09/23 13:58:38 mouring Exp $ |
@@ -115,24 +115,31 @@ OpenSSH contains no GPL code. | |||
115 | * OpenBSD project by leaving this copyright notice intact. | 115 | * OpenBSD project by leaving this copyright notice intact. |
116 | 116 | ||
117 | 5) | 117 | 5) |
118 | The Rijndael implementation is from Dr Brian Gladman and is | 118 | The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers |
119 | provided under a BSD-style license. | 119 | and Paulo Barreto is in the public domain and distributed |
120 | 120 | with the following license: | |
121 | Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK | 121 | |
122 | 122 | * @version 3.0 (December 2000) | |
123 | TERMS | 123 | * |
124 | 124 | * Optimised ANSI C code for the Rijndael cipher (now AES) | |
125 | Redistribution and use in source and binary forms, with or without | 125 | * |
126 | modification, are permitted provided that the following conditions | 126 | * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be> |
127 | are met: | 127 | * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be> |
128 | 1. Redistributions of source code must retain the above copyright | 128 | * @author Paulo Barreto <paulo.barreto@terra.com.br> |
129 | notice, this list of conditions and the following disclaimer. | 129 | * |
130 | 2. Redistributions in binary form must reproduce the above copyright | 130 | * This code is hereby placed in the public domain. |
131 | notice, this list of conditions and the following disclaimer in the | 131 | * |
132 | documentation and/or other materials provided with the distribution. | 132 | * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS |
133 | 133 | * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |
134 | This software is provided 'as is' with no guarantees of correctness or | 134 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
135 | fitness for purpose. | 135 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE |
136 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
137 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
138 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR | ||
139 | * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
140 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE | ||
141 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
142 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
136 | 143 | ||
137 | 6) | 144 | 6) |
138 | Remaining components of the software are provided under a standard | 145 | Remaining components of the software are provided under a standard |