mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 10:00:14 +00: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.
217 lines
6.0 KiB
C
217 lines
6.0 KiB
C
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Functions for manipulating the known hosts files.
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*
|
|
*
|
|
* Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
|
|
* Copyright (c) 1999 Niels Provos. 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: hostfile.c,v 1.24 2001/01/21 19:05:49 markus Exp $");
|
|
|
|
#include "packet.h"
|
|
#include "match.h"
|
|
#include "key.h"
|
|
#include "hostfile.h"
|
|
#include "log.h"
|
|
|
|
/*
|
|
* Parses an RSA (number of bits, e, n) or DSA key from a string. Moves the
|
|
* pointer over the key. Skips any whitespace at the beginning and at end.
|
|
*/
|
|
|
|
int
|
|
hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
|
|
{
|
|
char *cp;
|
|
|
|
/* Skip leading whitespace. */
|
|
for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
|
|
;
|
|
|
|
if (key_read(ret, &cp) != 1)
|
|
return 0;
|
|
|
|
/* Skip trailing whitespace. */
|
|
for (; *cp == ' ' || *cp == '\t'; cp++)
|
|
;
|
|
|
|
/* Return results. */
|
|
*cpp = cp;
|
|
*bitsp = key_size(ret);
|
|
return 1;
|
|
}
|
|
|
|
int
|
|
auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n)
|
|
{
|
|
Key *k = key_new(KEY_RSA1);
|
|
int ret = hostfile_read_key(cpp, bitsp, k);
|
|
BN_copy(e, k->rsa->e);
|
|
BN_copy(n, k->rsa->n);
|
|
key_free(k);
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)
|
|
{
|
|
if (key == NULL || key->type != KEY_RSA1 || key->rsa == NULL)
|
|
return 1;
|
|
if (bits != BN_num_bits(key->rsa->n)) {
|
|
log("Warning: %s, line %d: keysize mismatch for host %s: "
|
|
"actual %d vs. announced %d.",
|
|
filename, linenum, host, BN_num_bits(key->rsa->n), bits);
|
|
log("Warning: replace %d with %d in %s, line %d.",
|
|
bits, BN_num_bits(key->rsa->n), filename, linenum);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Checks whether the given host (which must be in all lowercase) is already
|
|
* in the list of our known hosts. Returns HOST_OK if the host is known and
|
|
* has the specified key, HOST_NEW if the host is not known, and HOST_CHANGED
|
|
* if the host is known but used to have a different host key.
|
|
*/
|
|
|
|
HostStatus
|
|
check_host_in_hostfile(const char *filename, const char *host, Key *key,
|
|
Key *found, int *numret)
|
|
{
|
|
FILE *f;
|
|
char line[8192];
|
|
int linenum = 0;
|
|
u_int kbits, hostlen;
|
|
char *cp, *cp2;
|
|
HostStatus end_return;
|
|
|
|
if (key == NULL)
|
|
fatal("no key to look up");
|
|
/* Open the file containing the list of known hosts. */
|
|
f = fopen(filename, "r");
|
|
if (!f)
|
|
return HOST_NEW;
|
|
|
|
/* Cache the length of the host name. */
|
|
hostlen = strlen(host);
|
|
|
|
/*
|
|
* Return value when the loop terminates. This is set to
|
|
* HOST_CHANGED if we have seen a different key for the host and have
|
|
* not found the proper one.
|
|
*/
|
|
end_return = HOST_NEW;
|
|
|
|
/* Go trough the file. */
|
|
while (fgets(line, sizeof(line), f)) {
|
|
cp = line;
|
|
linenum++;
|
|
|
|
/* Skip any leading whitespace, comments and empty lines. */
|
|
for (; *cp == ' ' || *cp == '\t'; cp++)
|
|
;
|
|
if (!*cp || *cp == '#' || *cp == '\n')
|
|
continue;
|
|
|
|
/* Find the end of the host name portion. */
|
|
for (cp2 = cp; *cp2 && *cp2 != ' ' && *cp2 != '\t'; cp2++)
|
|
;
|
|
|
|
/* Check if the host name matches. */
|
|
if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1)
|
|
continue;
|
|
|
|
/* Got a match. Skip host name. */
|
|
cp = cp2;
|
|
|
|
/*
|
|
* Extract the key from the line. This will skip any leading
|
|
* whitespace. Ignore badly formatted lines.
|
|
*/
|
|
if (!hostfile_read_key(&cp, &kbits, found))
|
|
continue;
|
|
if (!hostfile_check_key(kbits, found, host, filename, linenum))
|
|
continue;
|
|
|
|
if (numret != NULL)
|
|
*numret = linenum;
|
|
|
|
/* Check if the current key is the same as the given key. */
|
|
if (key_equal(key, found)) {
|
|
/* Ok, they match. */
|
|
fclose(f);
|
|
return HOST_OK;
|
|
}
|
|
/*
|
|
* They do not match. We will continue to go through the
|
|
* file; however, we note that we will not return that it is
|
|
* new.
|
|
*/
|
|
end_return = HOST_CHANGED;
|
|
}
|
|
/* Clear variables and close the file. */
|
|
fclose(f);
|
|
|
|
/*
|
|
* Return either HOST_NEW or HOST_CHANGED, depending on whether we
|
|
* saw a different key for the host.
|
|
*/
|
|
return end_return;
|
|
}
|
|
|
|
/*
|
|
* Appends an entry to the host file. Returns false if the entry could not
|
|
* be appended.
|
|
*/
|
|
|
|
int
|
|
add_host_to_hostfile(const char *filename, const char *host, Key *key)
|
|
{
|
|
FILE *f;
|
|
int success = 0;
|
|
if (key == NULL)
|
|
return 1; /* XXX ? */
|
|
f = fopen(filename, "a");
|
|
if (!f)
|
|
return 0;
|
|
fprintf(f, "%s ", host);
|
|
if (key_write(key, f)) {
|
|
success = 1;
|
|
} else {
|
|
error("add_host_to_hostfile: saving key in %s failed", filename);
|
|
}
|
|
fprintf(f, "\n");
|
|
fclose(f);
|
|
return success;
|
|
}
|