- (bal) LICENCE update. Has not been done in a while.

diff --git a/ChangeLog b/ChangeLog
index a8993f7afa3f23ec5ce6fe77408f652124768330..aa2b01d5553b3e72b44e654f83be5487f45e18e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
  - (djm) Specify --datadir in RPM spec files so smartcard applet gets
     put somewhere sane. Add Ssh.bin to manifest.
  - (djm) Make smartcard support conditional in Redhat RPM spec
+ - (bal) LICENCE update.  Has not been done in a while.
 
 20010917
  - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds

diff --git a/LICENCE b/LICENCE
index f60f50205a13c08fde8aa8b1eb3b0de6e57f3a39..170e2276d70c199b32ddddf92fdbd9f5dd185815 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -26,7 +26,7 @@ OpenSSH contains no GPL code.
 
     [However, none of that term is relevant at this point in time.  All of
     these restrictively licenced software components which he talks about
-    have been removed from OpenSSH, ie.
+    have been removed from OpenSSH, i.e.,
 
      - RSA is no longer included, found in the OpenSSL library
      - IDEA is no longer included, its use is deprecated
@@ -85,8 +85,7 @@ OpenSSH contains no GPL code.
 
 3)
     The 32-bit CRC compensation attack detector in deattack.c was
-    contributed by CORE SDI S.A. under a BSD-style license. See
-    http://www.core-sdi.com/english/ssh/ for details.
+    contributed by CORE SDI S.A. under a BSD-style license.
 
      * Cryptographic attack detector for ssh - source code
      *
@@ -104,8 +103,38 @@ OpenSSH contains no GPL code.
      *
      * Ariel Futoransky <futo@core-sdi.com>
      * <http://www.core-sdi.com>
-    
+
 4)
+    ssh-keygen was contributed by David Mazieres under a BSD-style
+    license.
+
+     * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
+     *
+     * Modification and redistribution in source and binary forms is
+     * permitted provided that due credit is given to the author and the
+     * OpenBSD project by leaving this copyright notice intact.
+
+5)
+    The Rijndael implementation is from Dr Brian Gladman and is
+    provided under a BSD-style license.
+
+    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.
+    
+6)
     Remaining components of the software are provided under a standard
     2-term BSD licence with the following names as copyright holders:
 
@@ -114,6 +143,8 @@ OpenSSH contains no GPL code.
        Niels Provos
        Dug Song
        Aaron Campbell
+       Damien Miller
+       Kevin Steves
 
      * Redistribution and use in source and binary forms, with or without
      * modification, are permitted provided that the following conditions