summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:36:27 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:36:27 +0000
commit033e4557c0a0944d9e96fa8c1577eabe0aa44eda (patch)
tree58c035d8572d0e657300eac130131989b7eb7ebb
parentcf8cadf6f78b656025867a941aa86a988ad7f7f7 (diff)
- (bal) LICENCE update. Has not been done in a while.
-rw-r--r--ChangeLog3
-rw-r--r--LICENCE39
2 files changed, 37 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e3cc2c33..a883c5c6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
7 - (djm) Specify --datadir in RPM spec files so smartcard applet gets 7 - (djm) Specify --datadir in RPM spec files so smartcard applet gets
8 put somewhere sane. Add Ssh.bin to manifest. 8 put somewhere sane. Add Ssh.bin to manifest.
9 - (djm) Make smartcard support conditional in Redhat RPM spec 9 - (djm) Make smartcard support conditional in Redhat RPM spec
10 - (bal) LICENCE update. Has not been done in a while.
10 11
1120010917 1220010917
12 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds 13 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6467,4 +6468,4 @@
6467 - Wrote replacements for strlcpy and mkdtemp 6468 - Wrote replacements for strlcpy and mkdtemp
6468 - Released 1.0pre1 6469 - Released 1.0pre1
6469 6470
6470$Id: ChangeLog,v 1.1530 2001/09/18 05:33:07 djm Exp $ 6471$Id: ChangeLog,v 1.1531 2001/09/18 05:36:27 mouring Exp $
diff --git a/LICENCE b/LICENCE
index f60f50205..170e2276d 100644
--- a/LICENCE
+++ b/LICENCE
@@ -26,7 +26,7 @@ OpenSSH contains no GPL code.
26 26
27 [However, none of that term is relevant at this point in time. All of 27 [However, none of that term is relevant at this point in time. All of
28 these restrictively licenced software components which he talks about 28 these restrictively licenced software components which he talks about
29 have been removed from OpenSSH, ie. 29 have been removed from OpenSSH, i.e.,
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, its use is deprecated 32 - IDEA is no longer included, its use is deprecated
@@ -85,8 +85,7 @@ OpenSSH contains no GPL code.
85 85
863) 863)
87 The 32-bit CRC compensation attack detector in deattack.c was 87 The 32-bit CRC compensation attack detector in deattack.c was
88 contributed by CORE SDI S.A. under a BSD-style license. See 88 contributed by CORE SDI S.A. under a BSD-style license.
89 http://www.core-sdi.com/english/ssh/ for details.
90 89
91 * Cryptographic attack detector for ssh - source code 90 * Cryptographic attack detector for ssh - source code
92 * 91 *
@@ -104,8 +103,38 @@ OpenSSH contains no GPL code.
104 * 103 *
105 * Ariel Futoransky <futo@core-sdi.com> 104 * Ariel Futoransky <futo@core-sdi.com>
106 * <http://www.core-sdi.com> 105 * <http://www.core-sdi.com>
107 106
1084) 1074)
108 ssh-keygen was contributed by David Mazieres under a BSD-style
109 license.
110
111 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
112 *
113 * Modification and redistribution in source and binary forms is
114 * permitted provided that due credit is given to the author and the
115 * OpenBSD project by leaving this copyright notice intact.
116
1175)
118 The Rijndael implementation is from Dr Brian Gladman and is
119 provided under a BSD-style license.
120
121 Copyright (c) 2001 Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK
122
123 TERMS
124
125 Redistribution and use in source and binary forms, with or without
126 modification, are permitted provided that the following conditions
127 are met:
128 1. Redistributions of source code must retain the above copyright
129 notice, this list of conditions and the following disclaimer.
130 2. Redistributions in binary form must reproduce the above copyright
131 notice, this list of conditions and the following disclaimer in the
132 documentation and/or other materials provided with the distribution.
133
134 This software is provided 'as is' with no guarantees of correctness or
135 fitness for purpose.
136
1376)
109 Remaining components of the software are provided under a standard 138 Remaining components of the software are provided under a standard
110 2-term BSD licence with the following names as copyright holders: 139 2-term BSD licence with the following names as copyright holders:
111 140
@@ -114,6 +143,8 @@ OpenSSH contains no GPL code.
114 Niels Provos 143 Niels Provos
115 Dug Song 144 Dug Song
116 Aaron Campbell 145 Aaron Campbell
146 Damien Miller
147 Kevin Steves
117 148
118 * Redistribution and use in source and binary forms, with or without 149 * Redistribution and use in source and binary forms, with or without
119 * modification, are permitted provided that the following conditions 150 * modification, are permitted provided that the following conditions