mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-30 18:03:32 +08:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
143 lines
3.9 KiB
C
143 lines
3.9 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 $");
|
|
|
|
#ifdef HAVE_LIBPCRE
|
|
# include <pcreposix.h>
|
|
#else /* Use native regex libraries */
|
|
# ifdef HAVE_REGEX_H
|
|
# include <regex.h>
|
|
# else
|
|
# ifdef HAVE_REGCOMP
|
|
# include "fake-regex.h"
|
|
# else
|
|
# error "No regular libraries detected. See INSTALL file."
|
|
# endif
|
|
# endif
|
|
#endif /* HAVE_LIBPCRE */
|
|
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "compat.h"
|
|
#include "log.h"
|
|
|
|
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;
|
|
}
|