mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-24 10:53:24 +08:00
48bd7c118a
- markus@cvs.openbsd.org 2001/01/08 22:29:05 [auth2.c compat.c compat.h servconf.c servconf.h sshd.8 sshd_config version.h] implement option 'Banner /etc/issue.net' for ssh2, move version to 2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner is enabled). - markus@cvs.openbsd.org 2001/01/08 22:03:23 [channels.c ssh-keyscan.c] O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/08 21:55:41 [sshconnect1.c] more cleanups and fixes from stevesk@pobox.com: 1) try_agent_authentication() for loop will overwrite key just allocated with key_new(); don't alloc 2) call ssh_close_authentication_connection() before exit try_agent_authentication() 3) free mem on bad passphrase in try_rsa_authentication() - markus@cvs.openbsd.org 2001/01/08 21:48:17 [kex.c] missing free; thanks stevesk@pobox.com
134 lines
3.7 KiB
C
134 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 1999,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: compat.c,v 1.33 2001/01/08 22:29:05 markus Exp $");
|
|
|
|
#include "ssh.h"
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "compat.h"
|
|
#ifdef HAVE_LIBPCRE
|
|
# include <pcreposix.h>
|
|
#else /* Use native regex libraries */
|
|
# include <regex.h>
|
|
#endif /* HAVE_LIBPCRE */
|
|
|
|
int compat13 = 0;
|
|
int compat20 = 0;
|
|
int datafellows = 0;
|
|
|
|
void
|
|
enable_compat20(void)
|
|
{
|
|
verbose("Enabling compatibility mode for protocol 2.0");
|
|
compat20 = 1;
|
|
}
|
|
void
|
|
enable_compat13(void)
|
|
{
|
|
verbose("Enabling compatibility mode for protocol 1.3");
|
|
compat13 = 1;
|
|
}
|
|
/* datafellows bug compatibility */
|
|
void
|
|
compat_datafellows(const char *version)
|
|
{
|
|
int i, ret;
|
|
char ebuf[1024];
|
|
regex_t reg;
|
|
static struct {
|
|
char *pat;
|
|
int bugs;
|
|
} check[] = {
|
|
{ "^OpenSSH[-_]2\\.[012]",
|
|
SSH_OLD_SESSIONID|SSH_BUG_BANNER },
|
|
{ "^OpenSSH_2\\.3\\.0", SSH_BUG_BANNER },
|
|
{ "^OpenSSH", 0 },
|
|
{ "MindTerm", 0 },
|
|
{ "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
|
|
SSH_OLD_SESSIONID|SSH_BUG_DEBUG },
|
|
{ "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
|
|
SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
|
|
SSH_BUG_PKSERVICE|SSH_BUG_X11FWD },
|
|
{ "^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
|
|
SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
|
|
SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
|
|
SSH_BUG_PKAUTH },
|
|
{ "^2\\.[23]\\.0", SSH_BUG_HMAC},
|
|
{ "^2\\.[2-9]\\.", 0 },
|
|
{ "^2\\.4$", SSH_OLD_SESSIONID}, /* Van Dyke */
|
|
{ "^3\\.0 SecureCRT", SSH_OLD_SESSIONID},
|
|
{ "^1\\.7 SecureFX", SSH_OLD_SESSIONID},
|
|
{ NULL, 0 }
|
|
};
|
|
/* process table, return first match */
|
|
for (i = 0; check[i].pat; i++) {
|
|
ret = regcomp(®, check[i].pat, REG_EXTENDED|REG_NOSUB);
|
|
if (ret != 0) {
|
|
regerror(ret, ®, ebuf, sizeof(ebuf));
|
|
ebuf[sizeof(ebuf)-1] = '\0';
|
|
error("regerror: %s", ebuf);
|
|
continue;
|
|
}
|
|
ret = regexec(®, version, 0, NULL, 0);
|
|
regfree(®);
|
|
if (ret == 0) {
|
|
debug("match: %s pat %s", version, check[i].pat);
|
|
datafellows = check[i].bugs;
|
|
return;
|
|
}
|
|
}
|
|
debug("no match: %s", version);
|
|
}
|
|
|
|
#define SEP ","
|
|
int
|
|
proto_spec(const char *spec)
|
|
{
|
|
char *s, *p, *q;
|
|
int ret = SSH_PROTO_UNKNOWN;
|
|
|
|
if (spec == NULL)
|
|
return ret;
|
|
q = s = xstrdup(spec);
|
|
for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
|
|
switch(atoi(p)) {
|
|
case 1:
|
|
if (ret == SSH_PROTO_UNKNOWN)
|
|
ret |= SSH_PROTO_1_PREFERRED;
|
|
ret |= SSH_PROTO_1;
|
|
break;
|
|
case 2:
|
|
ret |= SSH_PROTO_2;
|
|
break;
|
|
default:
|
|
log("ignoring bad proto spec: '%s'.", p);
|
|
break;
|
|
}
|
|
}
|
|
xfree(s);
|
|
return ret;
|
|
}
|