- 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.

diff --git a/ChangeLog b/ChangeLog
index df294f7f4650802dff9c53106d3f2d64d7bc259a..8102962d15d01206424e73062736a8d2e378cd28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,17 @@
    - jakob@cvs.openbsd.org 2001/07/30 16:06:07
      [scard.c scard.h]
      better errorcodes from sc_*; ok markus@
+   - 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.
 
 20010803
  - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on

diff --git a/rijndael.c b/rijndael.c
index 8b213db075e198eff33594a98ed196ea28014a00..1b2ff7bf5b8c29364c2770b69850ab2090865161 100644 (file)
--- a/rijndael.c
+++ b/rijndael.c
@@ -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)
 

diff --git a/rijndael.h b/rijndael.h
index 1656448c9d23a232cd39716f74ab60cfe62f7435..db33805eca52775e042cca2829ee8219ef40e942 100644 (file)
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rijndael.h,v 1.8 2001/05/09 23:01:31 markus Exp $     */
+/*     $OpenBSD: rijndael.h,v 1.9 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.
+   -----------------------------------------------------------------------
+*/
 
 #ifndef _RIJNDAEL_H_
 #define _RIJNDAEL_H_