- deraadt@cvs.openbsd.org 2001/03/01 03:38:33

     [cli.c cli.h rijndael.h ssh-keyscan.1]
     copyright notices on all source files

diff --git a/ChangeLog b/ChangeLog
index a9c6d038640187c7ab850645bb05966a21b7ebd8..d7d6de0109eb40fa5b98dd3ca3ab5b613e079c12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,9 @@
    - deraadt@cvs.openbsd.org 2001/03/01 02:45:10
      [auth-rsa.c auth2.c deattack.c packet.c]
      KNF
+   - deraadt@cvs.openbsd.org 2001/03/01 03:38:33
+     [cli.c cli.h rijndael.h ssh-keyscan.1]
+     copyright notices on all source files
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.

diff --git a/cli.c b/cli.c
index 52bb34aa01eaad78530a123c392709e6e0999ebc..915b34b14344fef8e7a04d77941075b2b7e302cb 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,31 @@
+/*     $OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $        */
+
+/*
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ *
+ * 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 BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "includes.h"
-RCSID("$OpenBSD: cli.c,v 1.9 2001/02/10 12:44:02 markus Exp $");
+RCSID("$OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "log.h"

diff --git a/cli.h b/cli.h
index 27e89b2940733c1b8c41b8426534bf6f3b03200c..bf263dbd29ff216165a34734465466d6c5bcc63f 100644 (file)
--- a/cli.h
+++ b/cli.h
@@ -1,4 +1,30 @@
-/* $OpenBSD: cli.h,v 1.3 2001/01/16 23:58:09 deraadt Exp $ */
+/*     $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */
+
+/*
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ *
+ * 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 BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */
 
 #ifndef CLI_H
 #define CLI_H

diff --git a/rijndael.h b/rijndael.h
index 01b342eb78e58d7374b5b15ac2e23424f4eb056e..fa350483ec56cd77fcf54e60962fe8ab7f358ced 100644 (file)
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,4 +1,18 @@
-/*     $OpenBSD: rijndael.h,v 1.6 2001/01/29 01:58:17 niklas Exp $     */
+/*     $OpenBSD: rijndael.h,v 1.7 2001/03/01 03:38:33 deraadt Exp $    */
+
+/* This is an independent implementation of the encryption algorithm:   */
+/*                                                                      */
+/*         RIJNDAEL by Joan Daemen and Vincent Rijmen                   */
+/*                                                                      */
+/* which is a candidate algorithm in the Advanced Encryption Standard   */
+/* programme of the US National Institute of Standards and Technology.  */
+/*                                                                      */
+/* Copyright in this implementation is held by Dr B R Gladman but I     */
+/* hereby give permission for its free direct or derivative use subject */
+/* to acknowledgment of its origin and compliance with any conditions   */
+/* that the originators of the algorithm place on its exploitation.     */
+/*                                                                      */
+/* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999     */
 
 #ifndef _RIJNDAEL_H_
 #define _RIJNDAEL_H_

diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 9f71705d99e43aed29a3484a4615b474a0f84441..eace55dd6641481b0e7ed444edeadac03cfda428 100644 (file)
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,7 +1,14 @@
-.\"    $OpenBSD: ssh-keyscan.1,v 1.3 2001/01/29 01:58:18 niklas Exp $
+.\"    $OpenBSD: ssh-keyscan.1,v 1.4 2001/03/01 03:38:33 deraadt Exp $
+.\"
+.\" 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 (for instance by leaving this copyright notice
+.\" intact).
 .\"
 .Dd January 1, 1996
-.Dt ssh-keyscan 1
+.Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME
 .Nm ssh-keyscan
@@ -72,7 +79,7 @@ Find all hosts from the file
 which have new or different keys from those in the sorted file
 .Pa ssh_known_hosts :
 .Bd -literal
-ssh-keyscan -f ssh_hosts | sort -u - ssh_known_hosts | \e\ 
+$ ssh-keyscan -f ssh_hosts | sort -u - ssh_known_hosts | \e\ 
        diff ssh_known_hosts -
 .Ed
 .Pp
@@ -91,7 +98,7 @@ of all the machines it scans.
 This is because it opens a connection to the ssh port, reads the public
 key, and drops the connection as soon as it gets the key.
 .Sh SEE ALSO
-.Xr ssh 1
+.Xr ssh 1 ,
 .Xr sshd 8
 .Sh AUTHOR
 David Mazieres <dm@lcs.mit.edu>