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.h | |
parent | 30b00be24f3e60dcb6d3113a8507d8b81e895460 (diff) |
- 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.h')
-rw-r--r-- | rijndael.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/rijndael.h b/rijndael.h index 1656448c9..db33805ec 100644 --- a/rijndael.h +++ b/rijndael.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rijndael.h,v 1.8 2001/05/09 23:01:31 markus Exp $ */ | 1 | /* $OpenBSD: rijndael.h,v 1.9 2001/07/30 16:23:30 stevesk Exp $ */ |
2 | 2 | ||
3 | /* This is an independent implementation of the encryption algorithm: */ | 3 | /* This is an independent implementation of the encryption algorithm: */ |
4 | /* */ | 4 | /* */ |
@@ -6,13 +6,26 @@ | |||
6 | /* */ | 6 | /* */ |
7 | /* which is a candidate algorithm in the Advanced Encryption Standard */ | 7 | /* which is a candidate algorithm in the Advanced Encryption Standard */ |
8 | /* programme of the US National Institute of Standards and Technology. */ | 8 | /* programme of the US National Institute of Standards and Technology. */ |
9 | /* */ | 9 | |
10 | /* Copyright in this implementation is held by Dr B R Gladman but I */ | 10 | /* |
11 | /* hereby give permission for its free direct or derivative use subject */ | 11 | ----------------------------------------------------------------------- |
12 | /* to acknowledgment of its origin and compliance with any conditions */ | 12 | Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK |
13 | /* that the originators of the algorithm place on its exploitation. */ | 13 | |
14 | /* */ | 14 | TERMS |
15 | /* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */ | 15 | |
16 | Redistribution and use in source and binary forms, with or without | ||
17 | modification, are permitted provided that the following conditions | ||
18 | are met: | ||
19 | 1. Redistributions of source code must retain the above copyright | ||
20 | notice, this list of conditions and the following disclaimer. | ||
21 | 2. Redistributions in binary form must reproduce the above copyright | ||
22 | notice, this list of conditions and the following disclaimer in the | ||
23 | documentation and/or other materials provided with the distribution. | ||
24 | |||
25 | This software is provided 'as is' with no guarantees of correctness or | ||
26 | fitness for purpose. | ||
27 | ----------------------------------------------------------------------- | ||
28 | */ | ||
16 | 29 | ||
17 | #ifndef _RIJNDAEL_H_ | 30 | #ifndef _RIJNDAEL_H_ |
18 | #define _RIJNDAEL_H_ | 31 | #define _RIJNDAEL_H_ |