diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cli.c | 28 | ||||
-rw-r--r-- | cli.h | 28 | ||||
-rw-r--r-- | rijndael.h | 16 | ||||
-rw-r--r-- | ssh-keyscan.1 | 15 |
5 files changed, 84 insertions, 8 deletions
@@ -103,6 +103,9 @@ | |||
103 | - deraadt@cvs.openbsd.org 2001/03/01 02:45:10 | 103 | - deraadt@cvs.openbsd.org 2001/03/01 02:45:10 |
104 | [auth-rsa.c auth2.c deattack.c packet.c] | 104 | [auth-rsa.c auth2.c deattack.c packet.c] |
105 | KNF | 105 | KNF |
106 | - deraadt@cvs.openbsd.org 2001/03/01 03:38:33 | ||
107 | [cli.c cli.h rijndael.h ssh-keyscan.1] | ||
108 | copyright notices on all source files | ||
106 | 109 | ||
107 | 20010304 | 110 | 20010304 |
108 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 111 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4295,4 +4298,4 @@ | |||
4295 | - Wrote replacements for strlcpy and mkdtemp | 4298 | - Wrote replacements for strlcpy and mkdtemp |
4296 | - Released 1.0pre1 | 4299 | - Released 1.0pre1 |
4297 | 4300 | ||
4298 | $Id: ChangeLog,v 1.883 2001/03/05 06:47:00 mouring Exp $ | 4301 | $Id: ChangeLog,v 1.884 2001/03/05 06:50:47 mouring Exp $ |
@@ -1,5 +1,31 @@ | |||
1 | /* $OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions | ||
8 | * are met: | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
26 | |||
1 | #include "includes.h" | 27 | #include "includes.h" |
2 | RCSID("$OpenBSD: cli.c,v 1.9 2001/02/10 12:44:02 markus Exp $"); | 28 | RCSID("$OpenBSD: cli.c,v 1.10 2001/03/01 03:38:33 deraadt Exp $"); |
3 | 29 | ||
4 | #include "xmalloc.h" | 30 | #include "xmalloc.h" |
5 | #include "log.h" | 31 | #include "log.h" |
@@ -1,4 +1,30 @@ | |||
1 | /* $OpenBSD: cli.h,v 1.3 2001/01/16 23:58:09 deraadt Exp $ */ | 1 | /* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ |
2 | |||
3 | /* | ||
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions | ||
8 | * are met: | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | */ | ||
26 | |||
27 | /* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ | ||
2 | 28 | ||
3 | #ifndef CLI_H | 29 | #ifndef CLI_H |
4 | #define CLI_H | 30 | #define CLI_H |
diff --git a/rijndael.h b/rijndael.h index 01b342eb7..fa350483e 100644 --- a/rijndael.h +++ b/rijndael.h | |||
@@ -1,4 +1,18 @@ | |||
1 | /* $OpenBSD: rijndael.h,v 1.6 2001/01/29 01:58:17 niklas Exp $ */ | 1 | /* $OpenBSD: rijndael.h,v 1.7 2001/03/01 03:38:33 deraadt Exp $ */ |
2 | |||
3 | /* This is an independent implementation of the encryption algorithm: */ | ||
4 | /* */ | ||
5 | /* RIJNDAEL by Joan Daemen and Vincent Rijmen */ | ||
6 | /* */ | ||
7 | /* which is a candidate algorithm in the Advanced Encryption Standard */ | ||
8 | /* programme of the US National Institute of Standards and Technology. */ | ||
9 | /* */ | ||
10 | /* Copyright in this implementation is held by Dr B R Gladman but I */ | ||
11 | /* hereby give permission for its free direct or derivative use subject */ | ||
12 | /* to acknowledgment of its origin and compliance with any conditions */ | ||
13 | /* that the originators of the algorithm place on its exploitation. */ | ||
14 | /* */ | ||
15 | /* Dr Brian Gladman (gladman@seven77.demon.co.uk) 14th January 1999 */ | ||
2 | 16 | ||
3 | #ifndef _RIJNDAEL_H_ | 17 | #ifndef _RIJNDAEL_H_ |
4 | #define _RIJNDAEL_H_ | 18 | #define _RIJNDAEL_H_ |
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 9f71705d9..eace55dd6 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 | |||
@@ -1,7 +1,14 @@ | |||
1 | .\" $OpenBSD: ssh-keyscan.1,v 1.3 2001/01/29 01:58:18 niklas Exp $ | 1 | .\" $OpenBSD: ssh-keyscan.1,v 1.4 2001/03/01 03:38:33 deraadt Exp $ |
2 | .\" | ||
3 | .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | ||
4 | .\" | ||
5 | .\" Modification and redistribution in source and binary forms is | ||
6 | .\" permitted provided that due credit is given to the author and the | ||
7 | .\" OpenBSD project (for instance by leaving this copyright notice | ||
8 | .\" intact). | ||
2 | .\" | 9 | .\" |
3 | .Dd January 1, 1996 | 10 | .Dd January 1, 1996 |
4 | .Dt ssh-keyscan 1 | 11 | .Dt SSH-KEYSCAN 1 |
5 | .Os | 12 | .Os |
6 | .Sh NAME | 13 | .Sh NAME |
7 | .Nm ssh-keyscan | 14 | .Nm ssh-keyscan |
@@ -72,7 +79,7 @@ Find all hosts from the file | |||
72 | which have new or different keys from those in the sorted file | 79 | which have new or different keys from those in the sorted file |
73 | .Pa ssh_known_hosts : | 80 | .Pa ssh_known_hosts : |
74 | .Bd -literal | 81 | .Bd -literal |
75 | ssh-keyscan -f ssh_hosts | sort -u - ssh_known_hosts | \e\ | 82 | $ ssh-keyscan -f ssh_hosts | sort -u - ssh_known_hosts | \e\ |
76 | diff ssh_known_hosts - | 83 | diff ssh_known_hosts - |
77 | .Ed | 84 | .Ed |
78 | .Pp | 85 | .Pp |
@@ -91,7 +98,7 @@ of all the machines it scans. | |||
91 | This is because it opens a connection to the ssh port, reads the public | 98 | This is because it opens a connection to the ssh port, reads the public |
92 | key, and drops the connection as soon as it gets the key. | 99 | key, and drops the connection as soon as it gets the key. |
93 | .Sh SEE ALSO | 100 | .Sh SEE ALSO |
94 | .Xr ssh 1 | 101 | .Xr ssh 1 , |
95 | .Xr sshd 8 | 102 | .Xr sshd 8 |
96 | .Sh AUTHOR | 103 | .Sh AUTHOR |
97 | David Mazieres <dm@lcs.mit.edu> | 104 | David Mazieres <dm@lcs.mit.edu> |