summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--LICENCE8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e3685abb7..f1b222fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,10 @@
105 - (djm) Set PAM_RHOST earlier, patch from Andrew Bartlett 105 - (djm) Set PAM_RHOST earlier, patch from Andrew Bartlett
106 <abartlet@pcug.org.au> 106 <abartlet@pcug.org.au>
107 - (stevesk) misc.c: ssh.h not needed. 107 - (stevesk) misc.c: ssh.h not needed.
108 - (stevesk) OpenBSD sync:
109 - stevesk@cvs.openbsd.org 2001/02/11 06:15:57
110 [LICENSE]
111 typos and small cleanup; ok deraadt@
108 112
10920010210 11320010210
110 - (djm) Sync sftp and scp stuff from OpenBSD: 114 - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3888,4 +3892,4 @@
3888 - Wrote replacements for strlcpy and mkdtemp 3892 - Wrote replacements for strlcpy and mkdtemp
3889 - Released 1.0pre1 3893 - Released 1.0pre1
3890 3894
3891$Id: ChangeLog,v 1.742 2001/02/11 14:34:10 stevesk Exp $ 3895$Id: ChangeLog,v 1.743 2001/02/11 16:43:05 stevesk Exp $
diff --git a/LICENCE b/LICENCE
index 7c2346a04..f60f50205 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,7 +1,7 @@
1This file is part of the ssh software. 1This file is part of the OpenSSH software.
2 2
3The licences which components of this software falls under are as 3The licences which components of this software fall under are as
4follows. First, we will summarize and say that that all components 4follows. First, we will summarize and say that all components
5are under a BSD licence, or a licence more free than that. 5are under a BSD licence, or a licence more free than that.
6 6
7OpenSSH contains no GPL code. 7OpenSSH contains no GPL code.
@@ -29,7 +29,7 @@ OpenSSH contains no GPL code.
29 have been removed from OpenSSH, ie. 29 have been removed from OpenSSH, ie.
30 30
31 - RSA is no longer included, found in the OpenSSL library 31 - RSA is no longer included, found in the OpenSSL library
32 - IDEA is no longer included, it's use is depricated 32 - IDEA is no longer included, its use is deprecated
33 - DES is now external, in the OpenSSL library 33 - DES is now external, in the OpenSSL library
34 - GMP is no longer used, and instead we call BN code from OpenSSL 34 - GMP is no longer used, and instead we call BN code from OpenSSL
35 - Zlib is now external, in a library 35 - Zlib is now external, in a library