- (djm) Merge OpenBSD changes:

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index 9c03a468800d390b2d871e456515be7f311fe23f..3b0f286fd6f6419b4757ee0e778c55eab58d990f 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.20 2000/09/07 20:27:51 deraadt Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
@@ -54,15 +54,13 @@ RCSID("$OpenBSD: hostfile.c,v 1.20 2000/09/07 20:27:51 deraadt Exp $");
 int
 hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
 {
-       unsigned int bits;
        char *cp;
 
        /* Skip leading whitespace. */
        for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
                ;
 
-       bits = key_read(ret, &cp);
-       if (bits == 0)
+       if (key_read(ret, &cp) != 1)
                return 0;
 
        /* Skip trailing whitespace. */
@@ -71,14 +69,14 @@ hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
 
        /* Return results. */
        *cpp = cp;
-       *bitsp = bits;
+       *bitsp = key_size(ret);
        return 1;
 }
 
 int
 auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)
 {
-       Key *k = key_new(KEY_RSA);
+       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);
@@ -89,7 +87,7 @@ auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)
 int
 hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)
 {
-       if (key == NULL || key->type != KEY_RSA || key->rsa == NULL)
+       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: "