diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:24:11 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 21:24:11 +0000 |
commit | 0256e8b93c79b3eb4e9c69a3c550a209ca2018f7 (patch) | |
tree | fabe149cbb8e296ee611cbcad18979adb6e39e45 /rijndael.c | |
parent | 30b00be24f3e60dcb6d3113a8507d8b81e895460 (diff) | |
download | openssh-git-0256e8b93c79b3eb4e9c69a3c550a209ca2018f7.tar.gz |
- stevesk@cvs.openbsd.org 2001/07/30 16:23:30
[rijndael.c rijndael.h]
new BSD-style license:
Brian Gladman <brg@gladman.plus.com>:
>I have updated my code at:
>http://fp.gladman.plus.com/cryptography_technology/rijndael/index.htm
>with a copyright notice as follows:
>[...]
>I am not sure which version of my old code you are using but I am
>happy for the notice above to be substituted for my existing copyright
>intent if this meets your purpose.
Diffstat (limited to 'rijndael.c')
-rw-r--r-- | rijndael.c | 29 |
1 files changed, 21 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: rijndael.c,v 1.7 2001/02/04 15:32:24 stevesk Exp $ */ +/* $OpenBSD: rijndael.c,v 1.8 2001/07/30 16:23:30 stevesk Exp $ */ /* This is an independent implementation of the encryption algorithm: */ /* */ @@ -6,13 +6,26 @@ /* */ /* which is a candidate algorithm in the Advanced Encryption Standard */ /* programme of the US National Institute of Standards and Technology. */ -/* */ -/* Copyright in this implementation is held by Dr B R Gladman but I */ -/* hereby give permission for its free direct or derivative use subject */ -/* to acknowledgment of its origin and compliance with any conditions */ -/* that the originators of the algorithm place on its exploitation. */ -/* */ -/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */ + +/* + ----------------------------------------------------------------------- + Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, 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. + ----------------------------------------------------------------------- +*/ /* Timing data for Rijndael (rijndael.c) |