summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth-rsa.c3
-rw-r--r--auth2-pubkey.c3
-rw-r--r--authfile.c5
-rw-r--r--misc.c8
-rw-r--r--misc.h4
6 files changed, 18 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c4cca4ba..cf68f4fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
12 ignore). 12 ignore).
13 - don't do extra do_lstat() if we only have one matching file. 13 - don't do extra do_lstat() if we only have one matching file.
14 djm@ ok 14 djm@ ok
15 - dtucker@cvs.openbsd.org 2004/12/11 01:48:56
16 [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h]
17 Fix debug call in error path of authorized_keys processing and fix related
18 warnings; ok djm@
15 19
1620041208 2020041208
17 - (tim) [configure.ac] Comment some non obvious platforms in the 21 - (tim) [configure.ac] Comment some non obvious platforms in the
@@ -1942,4 +1946,4 @@
1942 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1946 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1943 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1947 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1944 1948
1945$Id: ChangeLog,v 1.3602 2004/12/11 02:37:22 dtucker Exp $ 1949$Id: ChangeLog,v 1.3603 2004/12/11 02:39:50 dtucker Exp $
diff --git a/auth-rsa.c b/auth-rsa.c
index 2060f8394..4378008d3 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rsa.c,v 1.61 2004/12/06 11:41:03 dtucker Exp $"); 17RCSID("$OpenBSD: auth-rsa.c,v 1.62 2004/12/11 01:48:56 dtucker Exp $");
18 18
19#include <openssl/rsa.h> 19#include <openssl/rsa.h>
20#include <openssl/md5.h> 20#include <openssl/md5.h>
@@ -33,6 +33,7 @@ RCSID("$OpenBSD: auth-rsa.c,v 1.61 2004/12/06 11:41:03 dtucker Exp $");
33#include "hostfile.h" 33#include "hostfile.h"
34#include "monitor_wrap.h" 34#include "monitor_wrap.h"
35#include "ssh.h" 35#include "ssh.h"
36#include "misc.h"
36 37
37/* import */ 38/* import */
38extern ServerOptions options; 39extern ServerOptions options;
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 41e23bebd..a97d0f430 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-pubkey.c,v 1.8 2004/12/06 11:41:03 dtucker Exp $"); 26RCSID("$OpenBSD: auth2-pubkey.c,v 1.9 2004/12/11 01:48:56 dtucker Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -41,6 +41,7 @@ RCSID("$OpenBSD: auth2-pubkey.c,v 1.8 2004/12/06 11:41:03 dtucker Exp $");
41#include "auth-options.h" 41#include "auth-options.h"
42#include "canohost.h" 42#include "canohost.h"
43#include "monitor_wrap.h" 43#include "monitor_wrap.h"
44#include "misc.h"
44 45
45/* import */ 46/* import */
46extern ServerOptions options; 47extern ServerOptions options;
diff --git a/authfile.c b/authfile.c
index 4038ab692..6a04cd7a9 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $"); 39RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $");
40 40
41#include <openssl/err.h> 41#include <openssl/err.h>
42#include <openssl/evp.h> 42#include <openssl/evp.h>
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $");
51#include "log.h" 51#include "log.h"
52#include "authfile.h" 52#include "authfile.h"
53#include "rsa.h" 53#include "rsa.h"
54#include "misc.h"
54 55
55/* Version identification string for SSH v1 identity files. */ 56/* Version identification string for SSH v1 identity files. */
56static const char authfile_id_string[] = 57static const char authfile_id_string[] =
@@ -603,7 +604,7 @@ key_try_load_public(Key *k, const char *filename, char **commentp)
603 FILE *f; 604 FILE *f;
604 char line[SSH_MAX_PUBKEY_BYTES]; 605 char line[SSH_MAX_PUBKEY_BYTES];
605 char *cp; 606 char *cp;
606 int linenum = 0; 607 u_long linenum = 0;
607 608
608 f = fopen(filename, "r"); 609 f = fopen(filename, "r");
609 if (f != NULL) { 610 if (f != NULL) {
diff --git a/misc.c b/misc.c
index d0cc53823..a90125505 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: misc.c,v 1.26 2004/12/06 11:41:03 dtucker Exp $"); 26RCSID("$OpenBSD: misc.c,v 1.27 2004/12/11 01:48:56 dtucker Exp $");
27 27
28#include "misc.h" 28#include "misc.h"
29#include "log.h" 29#include "log.h"
@@ -339,15 +339,15 @@ addargs(arglist *args, char *fmt, ...)
339 */ 339 */
340int 340int
341read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz, 341read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
342 int *lineno) 342 u_long *lineno)
343{ 343{
344 while (fgets(buf, bufsz, f) != NULL) { 344 while (fgets(buf, bufsz, f) != NULL) {
345 (*lineno)++; 345 (*lineno)++;
346 if (buf[strlen(buf) - 1] == '\n' || feof(f)) { 346 if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
347 return 0; 347 return 0;
348 } else { 348 } else {
349 debug("%s: %s line %d exceeds size limit", __func__, 349 debug("%s: %s line %lu exceeds size limit", __func__,
350 filename, lineno); 350 filename, *lineno);
351 /* discard remainder of line */ 351 /* discard remainder of line */
352 while(fgetc(f) != '\n' && !feof(f)) 352 while(fgetc(f) != '\n' && !feof(f))
353 ; /* nothing */ 353 ; /* nothing */
diff --git a/misc.h b/misc.h
index 4aab2ca01..193216fa9 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.19 2004/12/06 11:41:03 dtucker Exp $ */ 1/* $OpenBSD: misc.h,v 1.20 2004/12/11 01:48:56 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -47,4 +47,4 @@ char *tilde_expand_filename(const char *, uid_t);
47 47
48char *read_passphrase(const char *, int); 48char *read_passphrase(const char *, int);
49int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); 49int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
50int read_keyfile_line(FILE *, const char *, char *, size_t, int *); 50int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);