summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--LICENCE71
2 files changed, 53 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index fc17be0ca..8d3f589ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
120030611 120030611
2 - (djm) Sync LICENSE against OpenBSD
2 - (djm) OpenBSD CVS Sync 3 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2003/06/10 09:12:11 4 - jmc@cvs.openbsd.org 2003/06/10 09:12:11
4 [scp.1 sftp-server.8 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5] 5 [scp.1 sftp-server.8 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5]
@@ -506,4 +507,4 @@
506 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 507 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
507 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 508 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
508 509
509$Id: ChangeLog,v 1.2797 2003/06/11 12:06:33 djm Exp $ 510$Id: ChangeLog,v 1.2798 2003/06/11 12:08:36 djm Exp $
diff --git a/LICENCE b/LICENCE
index 19d4c74e6..f99f5b4cb 100644
--- a/LICENCE
+++ b/LICENCE
@@ -76,14 +76,6 @@ OpenSSH contains no GPL code.
76 POSSIBILITY OF SUCH DAMAGES. 76 POSSIBILITY OF SUCH DAMAGES.
77 77
782) 782)
79 The 32-bit CRC implementation in crc32.c is due to Gary S. Brown.
80 Comments in the file indicate it may be used for any purpose without
81 restrictions:
82
83 * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or
84 * code or tables extracted from it, as desired without restriction.
85
863)
87 The 32-bit CRC compensation attack detector in deattack.c was 79 The 32-bit CRC compensation attack detector in deattack.c was
88 contributed by CORE SDI S.A. under a BSD-style license. 80 contributed by CORE SDI S.A. under a BSD-style license.
89 81
@@ -104,7 +96,7 @@ OpenSSH contains no GPL code.
104 * Ariel Futoransky <futo@core-sdi.com> 96 * Ariel Futoransky <futo@core-sdi.com>
105 * <http://www.core-sdi.com> 97 * <http://www.core-sdi.com>
106 98
1074) 993)
108 ssh-keygen was contributed by David Mazieres under a BSD-style 100 ssh-keygen was contributed by David Mazieres under a BSD-style
109 license. 101 license.
110 102
@@ -114,7 +106,7 @@ OpenSSH contains no GPL code.
114 * permitted provided that due credit is given to the author and the 106 * permitted provided that due credit is given to the author and the
115 * OpenBSD project by leaving this copyright notice intact. 107 * OpenBSD project by leaving this copyright notice intact.
116 108
1175) 1094)
118 The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers 110 The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers
119 and Paulo Barreto is in the public domain and distributed 111 and Paulo Barreto is in the public domain and distributed
120 with the following license: 112 with the following license:
@@ -141,12 +133,10 @@ OpenSSH contains no GPL code.
141 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 133 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
142 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 134 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
143 135
1446) 1365)
145 One component of the ssh source code is under a 4-clause BSD license, 137 One component of the ssh source code is under a 3-clause BSD license,
146 held by the University of California, since we pulled these parts from 138 held by the University of California, since we pulled these parts from
147 original Berkeley code. The Regents of the University of California 139 original Berkeley code.
148 have declared that term 3 is no longer enforceable on their source code,
149 but we retain that license as is.
150 140
151 * Copyright (c) 1983, 1990, 1992, 1993, 1995 141 * Copyright (c) 1983, 1990, 1992, 1993, 1995
152 * The Regents of the University of California. All rights reserved. 142 * The Regents of the University of California. All rights reserved.
@@ -159,11 +149,7 @@ OpenSSH contains no GPL code.
159 * 2. Redistributions in binary form must reproduce the above copyright 149 * 2. Redistributions in binary form must reproduce the above copyright
160 * notice, this list of conditions and the following disclaimer in the 150 * notice, this list of conditions and the following disclaimer in the
161 * documentation and/or other materials provided with the distribution. 151 * documentation and/or other materials provided with the distribution.
162 * 3. All advertising materials mentioning features or use of this software 152 * 3. Neither the name of the University nor the names of its contributors
163 * must display the following acknowledgement:
164 * This product includes software developed by the University of
165 * California, Berkeley and its contributors.
166 * 4. Neither the name of the University nor the names of its contributors
167 * may be used to endorse or promote products derived from this software 153 * may be used to endorse or promote products derived from this software
168 * without specific prior written permission. 154 * without specific prior written permission.
169 * 155 *
@@ -179,6 +165,48 @@ OpenSSH contains no GPL code.
179 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 165 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
180 * SUCH DAMAGE. 166 * SUCH DAMAGE.
181 167
1686)
169 The progresssmeter code used by scp(1) and sftp(1) is copyright by
170 the NetBSD Foundation.
171
172 * Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
173 * All rights reserved.
174 *
175 * This code is derived from software contributed to The NetBSD Foundation
176 * by Luke Mewburn.
177 *
178 * This code is derived from software contributed to The NetBSD Foundation
179 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
180 * NASA Ames Research Center.
181 *
182 * Redistribution and use in source and binary forms, with or without
183 * modification, are permitted provided that the following conditions
184 * are met:
185 * 1. Redistributions of source code must retain the above copyright
186 * notice, this list of conditions and the following disclaimer.
187 * 2. Redistributions in binary form must reproduce the above copyright
188 * notice, this list of conditions and the following disclaimer in the
189 * documentation and/or other materials provided with the distribution.
190 * 3. All advertising materials mentioning features or use of this software
191 * must display the following acknowledgement:
192 * This product includes software developed by the NetBSD
193 * Foundation, Inc. and its contributors.
194 * 4. Neither the name of The NetBSD Foundation nor the names of its
195 * contributors may be used to endorse or promote products derived
196 * from this software without specific prior written permission.
197 *
198 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
199 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
200 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
201 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
202 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
203 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
204 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
205 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
206 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
207 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
208 * POSSIBILITY OF SUCH DAMAGE.
209
1827) 2107)
183 Remaining components of the software are provided under a standard 211 Remaining components of the software are provided under a standard
184 2-term BSD licence with the following names as copyright holders: 212 2-term BSD licence with the following names as copyright holders:
@@ -212,3 +240,6 @@ OpenSSH contains no GPL code.
212 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 240 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
213 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 241 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
214 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 242 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
243
244------
245$OpenBSD: LICENCE,v 1.14 2003/06/11 11:23:07 djm Exp $