summaryrefslogtreecommitdiff
path: root/LICENCE
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:26:16 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:05:04 +1000
commitdfa641f758d4b8b2608ab1b00abaf88df0a8e36a (patch)
treeefb5eff4bfad666a79aada19bbf8f795ddb392e5 /LICENCE
parente5d3bd36ef67d82092861f39b5bf422cb12b31a6 (diff)
downloadopenssh-git-dfa641f758d4b8b2608ab1b00abaf88df0a8e36a.tar.gz
upstream commit
remove the (in)famous SSHv1 CRC compensation attack detector. Despite your cameo in The Matrix movies, you will not be missed. ok markus Upstream-ID: 44261fce51a56d93cdb2af7b6e184be629f667e0
Diffstat (limited to 'LICENCE')
-rw-r--r--LICENCE23
1 files changed, 1 insertions, 22 deletions
diff --git a/LICENCE b/LICENCE
index f5238713..15248212 100644
--- a/LICENCE
+++ b/LICENCE
@@ -75,27 +75,6 @@ OpenSSH contains no GPL code.
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
-2)
- The 32-bit CRC compensation attack detector in deattack.c was
- contributed by CORE SDI S.A. under a BSD-style license.
-
- * Cryptographic attack detector for ssh - source code
- *
- * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina.
- *
- * All rights reserved. Redistribution and use in source and binary
- * forms, with or without modification, are permitted provided that
- * this copyright notice is retained.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
- * CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS
- * SOFTWARE.
- *
- * Ariel Futoransky <futo@core-sdi.com>
- * <http://www.core-sdi.com>
-
3)
ssh-keyscan was contributed by David Mazieres under a BSD-style
license.
@@ -337,4 +316,4 @@ OpenSSH contains no GPL code.
------
-$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
+$OpenBSD: LICENCE,v 1.20 2017/04/30 23:26:16 djm Exp $