diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 16:20:42 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 16:20:42 +1000 |
commit | 3f521e21c0b94cd0ac4752d60a9f9b4dfa9bf3f8 (patch) | |
tree | 1f7ccbd5d4628d7704fcbfc30d92645486b9760f | |
parent | 46471c9a81bdd0d797149a20364645bc6ffcf2cc (diff) |
- markus@cvs.openbsd.org 2003/07/02 20:37:48
[ssh.c]
convert hostkeyalias to lowercase, otherwise uppercase aliases will
not match at all; ok henning@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.c | 9 |
2 files changed, 13 insertions, 2 deletions
@@ -20,6 +20,10 @@ | |||
20 | (re)add socks5 suppport to -D; ok djm@ | 20 | (re)add socks5 suppport to -D; ok djm@ |
21 | now ssh(1) can act both as a socks 4 and socks 5 server and | 21 | now ssh(1) can act both as a socks 4 and socks 5 server and |
22 | dynamically forward ports. | 22 | dynamically forward ports. |
23 | - markus@cvs.openbsd.org 2003/07/02 20:37:48 | ||
24 | [ssh.c] | ||
25 | convert hostkeyalias to lowercase, otherwise uppercase aliases will | ||
26 | not match at all; ok henning@ | ||
23 | 27 | ||
24 | 20030630 | 28 | 20030630 |
25 | - (djm) Search for support functions necessary to build our | 29 | - (djm) Search for support functions necessary to build our |
@@ -640,4 +644,4 @@ | |||
640 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 644 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
641 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 645 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
642 | 646 | ||
643 | $Id: ChangeLog,v 1.2840 2003/07/03 03:55:19 dtucker Exp $ | 647 | $Id: ChangeLog,v 1.2841 2003/07/03 06:20:42 dtucker Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.194 2003/06/12 19:12:03 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.195 2003/07/02 20:37:48 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -597,6 +597,13 @@ again: | |||
597 | if (options.hostname != NULL) | 597 | if (options.hostname != NULL) |
598 | host = options.hostname; | 598 | host = options.hostname; |
599 | 599 | ||
600 | /* force lowercase for hostkey matching */ | ||
601 | if (options.host_key_alias != NULL) { | ||
602 | for (p = options.host_key_alias; *p; p++) | ||
603 | if (isupper(*p)) | ||
604 | *p = tolower(*p); | ||
605 | } | ||
606 | |||
600 | if (options.proxy_command != NULL && | 607 | if (options.proxy_command != NULL && |
601 | strcmp(options.proxy_command, "none") == 0) | 608 | strcmp(options.proxy_command, "none") == 0) |
602 | options.proxy_command = NULL; | 609 | options.proxy_command = NULL; |