diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-06 15:18:16 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-06 15:18:16 +0000 |
commit | d26dcf3371657e64dddc7c86c61a89666d4e7053 (patch) | |
tree | 34c3c8ce1bacad2b8a5d5999c0461bcba4abfa5c | |
parent | 8835a8910513621a4c20a0ede9a4bdeee947cbd4 (diff) |
20010107
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/06 11:23:27
[ssh-rsa.c]
remove unused
- itojun@cvs.openbsd.org 2001/01/05 08:23:29
[ssh-keyscan.1]
missing .El
- markus@cvs.openbsd.org 2001/01/04 22:41:03
[session.c sshconnect.c]
consistent use of _PATH_BSHELL; from stevesk@pobox.com
- djm@cvs.openbsd.org 2001/01/04 22:35:32
[ssh.1 sshd.8]
Mention AES as available SSH2 Cipher; ok markus
- markus@cvs.openbsd.org 2001/01/04 22:25:58
[sshd.c]
sync usage()/man with defaults; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/04 22:21:26
[sshconnect2.c]
handle SSH2_MSG_USERAUTH_BANNER; fixes bug when connecting to a server
that prints a banner (e.g. /etc/issue.net)
-rw-r--r-- | ChangeLog | 22 | ||||
-rw-r--r-- | session.c | 6 | ||||
-rw-r--r-- | ssh-keyscan.1 | 1 | ||||
-rw-r--r-- | ssh-rsa.c | 5 | ||||
-rw-r--r-- | ssh.1 | 4 | ||||
-rw-r--r-- | sshconnect.c | 2 | ||||
-rw-r--r-- | sshconnect2.c | 18 | ||||
-rw-r--r-- | sshd.8 | 4 | ||||
-rw-r--r-- | sshd.c | 4 |
9 files changed, 50 insertions, 16 deletions
@@ -1,3 +1,25 @@ | |||
1 | 20010107 | ||
2 | - (bal) OpenBSD Sync | ||
3 | - markus@cvs.openbsd.org 2001/01/06 11:23:27 | ||
4 | [ssh-rsa.c] | ||
5 | remove unused | ||
6 | - itojun@cvs.openbsd.org 2001/01/05 08:23:29 | ||
7 | [ssh-keyscan.1] | ||
8 | missing .El | ||
9 | - markus@cvs.openbsd.org 2001/01/04 22:41:03 | ||
10 | [session.c sshconnect.c] | ||
11 | consistent use of _PATH_BSHELL; from stevesk@pobox.com | ||
12 | - djm@cvs.openbsd.org 2001/01/04 22:35:32 | ||
13 | [ssh.1 sshd.8] | ||
14 | Mention AES as available SSH2 Cipher; ok markus | ||
15 | - markus@cvs.openbsd.org 2001/01/04 22:25:58 | ||
16 | [sshd.c] | ||
17 | sync usage()/man with defaults; from stevesk@pobox.com | ||
18 | - markus@cvs.openbsd.org 2001/01/04 22:21:26 | ||
19 | [sshconnect2.c] | ||
20 | handle SSH2_MSG_USERAUTH_BANNER; fixes bug when connecting to a server | ||
21 | that prints a banner (e.g. /etc/issue.net) | ||
22 | |||
1 | 20010105 | 23 | 20010105 |
2 | - (bal) contrib/caldera/ provided by Tim Rice <tim@multitalents.net> | 24 | - (bal) contrib/caldera/ provided by Tim Rice <tim@multitalents.net> |
3 | - (bal) bsd-getcwd.c and bsd-setenv.c changed from bcopy() to memmove() | 25 | - (bal) bsd-getcwd.c and bsd-setenv.c changed from bcopy() to memmove() |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.45 2000/12/19 23:17:58 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.46 2001/01/04 22:41:03 markus Exp $"); |
37 | 37 | ||
38 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |
39 | #include "ssh.h" | 39 | #include "ssh.h" |
@@ -1336,7 +1336,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1336 | if (!options.use_login) { | 1336 | if (!options.use_login) { |
1337 | if (stat(SSH_USER_RC, &st) >= 0) { | 1337 | if (stat(SSH_USER_RC, &st) >= 0) { |
1338 | if (debug_flag) | 1338 | if (debug_flag) |
1339 | fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_USER_RC); | 1339 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_USER_RC); |
1340 | 1340 | ||
1341 | f = popen(_PATH_BSHELL " " SSH_USER_RC, "w"); | 1341 | f = popen(_PATH_BSHELL " " SSH_USER_RC, "w"); |
1342 | if (f) { | 1342 | if (f) { |
@@ -1347,7 +1347,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1347 | fprintf(stderr, "Could not run %s\n", SSH_USER_RC); | 1347 | fprintf(stderr, "Could not run %s\n", SSH_USER_RC); |
1348 | } else if (stat(SSH_SYSTEM_RC, &st) >= 0) { | 1348 | } else if (stat(SSH_SYSTEM_RC, &st) >= 0) { |
1349 | if (debug_flag) | 1349 | if (debug_flag) |
1350 | fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_SYSTEM_RC); | 1350 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_SYSTEM_RC); |
1351 | 1351 | ||
1352 | f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w"); | 1352 | f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w"); |
1353 | if (f) { | 1353 | if (f) { |
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index efd6e744a..31bae33c3 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 | |||
@@ -56,6 +56,7 @@ is supplied instead of a filename, | |||
56 | will read hosts or | 56 | will read hosts or |
57 | .Pa addrlist namelist | 57 | .Pa addrlist namelist |
58 | pairs from the standard input. | 58 | pairs from the standard input. |
59 | .El | ||
59 | .Sh EXAMPLES | 60 | .Sh EXAMPLES |
60 | .Pp | 61 | .Pp |
61 | Print the host key for machine | 62 | Print the host key for machine |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.2 2000/12/19 23:17:58 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.3 2001/01/06 11:23:27 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -37,9 +37,6 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.2 2000/12/19 23:17:58 markus Exp $"); | |||
37 | 37 | ||
38 | #include "key.h" | 38 | #include "key.h" |
39 | 39 | ||
40 | #define INTBLOB_LEN 20 | ||
41 | #define SIGBLOB_LEN (2*INTBLOB_LEN) | ||
42 | |||
43 | /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ | 40 | /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */ |
44 | int | 41 | int |
45 | ssh_rsa_sign( | 42 | ssh_rsa_sign( |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.74 2000/12/27 12:30:20 markus Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.75 2001/01/04 22:35:32 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -664,7 +664,7 @@ Specifies the ciphers allowed for protocol version 2 | |||
664 | in order of preference. | 664 | in order of preference. |
665 | Multiple ciphers must be comma-separated. | 665 | Multiple ciphers must be comma-separated. |
666 | The default is | 666 | The default is |
667 | .Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour . | 667 | .Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . |
668 | .It Cm Compression | 668 | .It Cm Compression |
669 | Specifies whether to use compression. | 669 | Specifies whether to use compression. |
670 | The argument must be | 670 | The argument must be |
diff --git a/sshconnect.c b/sshconnect.c index 2102bef6f..f3244d35b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.88 2001/01/02 20:50:56 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.89 2001/01/04 22:41:03 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/dsa.h> | 19 | #include <openssl/dsa.h> |
diff --git a/sshconnect2.c b/sshconnect2.c index 34d72818f..8321c9eb7 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.34 2000/12/27 12:34:50 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.35 2001/01/04 22:21:26 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/rsa.h> | 29 | #include <openssl/rsa.h> |
@@ -467,6 +467,7 @@ struct Authmethod { | |||
467 | 467 | ||
468 | void input_userauth_success(int type, int plen, void *ctxt); | 468 | void input_userauth_success(int type, int plen, void *ctxt); |
469 | void input_userauth_failure(int type, int plen, void *ctxt); | 469 | void input_userauth_failure(int type, int plen, void *ctxt); |
470 | void input_userauth_banner(int type, int plen, void *ctxt); | ||
470 | void input_userauth_error(int type, int plen, void *ctxt); | 471 | void input_userauth_error(int type, int plen, void *ctxt); |
471 | void input_userauth_info_req(int type, int plen, void *ctxt); | 472 | void input_userauth_info_req(int type, int plen, void *ctxt); |
472 | 473 | ||
@@ -543,6 +544,7 @@ ssh_userauth2(const char *server_user, char *host) | |||
543 | dispatch_init(&input_userauth_error); | 544 | dispatch_init(&input_userauth_error); |
544 | dispatch_set(SSH2_MSG_USERAUTH_SUCCESS, &input_userauth_success); | 545 | dispatch_set(SSH2_MSG_USERAUTH_SUCCESS, &input_userauth_success); |
545 | dispatch_set(SSH2_MSG_USERAUTH_FAILURE, &input_userauth_failure); | 546 | dispatch_set(SSH2_MSG_USERAUTH_FAILURE, &input_userauth_failure); |
547 | dispatch_set(SSH2_MSG_USERAUTH_BANNER, &input_userauth_banner); | ||
546 | dispatch_run(DISPATCH_BLOCK, &authctxt.success, &authctxt); /* loop until success */ | 548 | dispatch_run(DISPATCH_BLOCK, &authctxt.success, &authctxt); /* loop until success */ |
547 | 549 | ||
548 | if (authctxt.agent != NULL) | 550 | if (authctxt.agent != NULL) |
@@ -553,7 +555,19 @@ ssh_userauth2(const char *server_user, char *host) | |||
553 | void | 555 | void |
554 | input_userauth_error(int type, int plen, void *ctxt) | 556 | input_userauth_error(int type, int plen, void *ctxt) |
555 | { | 557 | { |
556 | fatal("input_userauth_error: bad message during authentication"); | 558 | fatal("input_userauth_error: bad message during authentication: " |
559 | "type %d", type); | ||
560 | } | ||
561 | void | ||
562 | input_userauth_banner(int type, int plen, void *ctxt) | ||
563 | { | ||
564 | char *msg, *lang; | ||
565 | debug3("input_userauth_banner"); | ||
566 | msg = packet_get_string(NULL); | ||
567 | lang = packet_get_string(NULL); | ||
568 | fprintf(stderr, "%s", msg); | ||
569 | xfree(msg); | ||
570 | xfree(lang); | ||
557 | } | 571 | } |
558 | void | 572 | void |
559 | input_userauth_success(int type, int plen, void *ctxt) | 573 | input_userauth_success(int type, int plen, void *ctxt) |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.76 2000/12/28 12:03:57 markus Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.78 2001/01/04 22:35:32 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -337,7 +337,7 @@ By default login is allowed regardless of the user name. | |||
337 | Specifies the ciphers allowed for protocol version 2. | 337 | Specifies the ciphers allowed for protocol version 2. |
338 | Multiple ciphers must be comma-separated. | 338 | Multiple ciphers must be comma-separated. |
339 | The default is | 339 | The default is |
340 | .Dq 3des-cbc,blowfish-cbc,arcfour,cast128-cbc . | 340 | .Dq 3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes128-cbc . |
341 | .It Cm CheckMail | 341 | .It Cm CheckMail |
342 | Specifies whether | 342 | Specifies whether |
343 | .Nm | 343 | .Nm |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.144 2000/12/28 12:03:58 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.145 2001/01/04 22:25:58 markus Exp $"); |
44 | 44 | ||
45 | #include "xmalloc.h" | 45 | #include "xmalloc.h" |
46 | #include "rsa.h" | 46 | #include "rsa.h" |
@@ -657,7 +657,7 @@ main(int ac, char **av) | |||
657 | fprintf(stderr, " -q Quiet (no logging)\n"); | 657 | fprintf(stderr, " -q Quiet (no logging)\n"); |
658 | fprintf(stderr, " -p port Listen on the specified port (default: 22)\n"); | 658 | fprintf(stderr, " -p port Listen on the specified port (default: 22)\n"); |
659 | fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n"); | 659 | fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n"); |
660 | fprintf(stderr, " -g seconds Grace period for authentication (default: 300)\n"); | 660 | fprintf(stderr, " -g seconds Grace period for authentication (default: 600)\n"); |
661 | fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n"); | 661 | fprintf(stderr, " -b bits Size of server RSA key (default: 768 bits)\n"); |
662 | fprintf(stderr, " -h file File from which to read host key (default: %s)\n", | 662 | fprintf(stderr, " -h file File from which to read host key (default: %s)\n", |
663 | HOST_KEY_FILE); | 663 | HOST_KEY_FILE); |