mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2001/07/30 16:23:30

Browse Source 
[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.
This commit is contained in:
Ben Lindstrom 2001-08-06 21:24:11 +00:00
parent 30b00be24f
commit 0256e8b93c
3 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -61,6 +61,17 @@
- jakob@cvs.openbsd.org 2001/07/30 16:06:07 - jakob@cvs.openbsd.org 2001/07/30 16:06:07
[scard.c scard.h] [scard.c scard.h]
better errorcodes from sc_*; ok markus@ 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 20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6171,4 +6182,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1443 2001/08/06 21:22:10 mouring Exp $ $Id: ChangeLog,v 1.1444 2001/08/06 21:24:11 mouring Exp $

29
rijndael.c
View File

@ -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: */ /* This is an independent implementation of the encryption algorithm: */
/* */ /* */
@ -6,13 +6,26 @@
/* */ /* */
/* which is a candidate algorithm in the Advanced Encryption Standard */ /* which is a candidate algorithm in the Advanced Encryption Standard */
/* programme of the US National Institute of Standards and Technology. */ /* 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 */ Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK
/* that the originators of the algorithm place on its exploitation. */
/* */ TERMS
/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */
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) /* Timing data for Rijndael (rijndael.c)

29
rijndael.h
View File

@ -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: */ /* This is an independent implementation of the encryption algorithm: */
/* */ /* */
@ -6,13 +6,26 @@
/* */ /* */
/* which is a candidate algorithm in the Advanced Encryption Standard */ /* which is a candidate algorithm in the Advanced Encryption Standard */
/* programme of the US National Institute of Standards and Technology. */ /* 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 */ Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK
/* that the originators of the algorithm place on its exploitation. */
/* */ TERMS
/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */
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_ #ifndef _RIJNDAEL_H_
#define _RIJNDAEL_H_ #define _RIJNDAEL_H_