summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--clientloop.c3
-rw-r--r--misc.h14
-rw-r--r--readpass.c4
-rw-r--r--readpass.h19
-rw-r--r--scard.c4
-rw-r--r--ssh-add.c3
-rw-r--r--ssh-agent.c3
-rw-r--r--ssh-keygen.c4
-rw-r--r--sshconnect.c3
-rw-r--r--sshconnect1.c4
-rw-r--r--sshconnect2.c4
12 files changed, 32 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f180dd21..b22850184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
13 [auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c 13 [auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c
14 tildexpand.c], removed: sshtty.h tildexpand.h 14 tildexpand.c], removed: sshtty.h tildexpand.h
15 make two tiny header files go away; djm ok 15 make two tiny header files go away; djm ok
16 - djm@cvs.openbsd.org 2004/05/08 00:21:31
17 [clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c
18 sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h
19 kill a tiny header; ok deraadt@
16 20
1720040502 2120040502
18 - (dtucker) OpenBSD CVS Sync 22 - (dtucker) OpenBSD CVS Sync
@@ -1089,4 +1093,4 @@
1089 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1093 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1090 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1094 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1091 1095
1092$Id: ChangeLog,v 1.3345 2004/05/13 06:06:46 dtucker Exp $ 1096$Id: ChangeLog,v 1.3346 2004/05/13 06:15:47 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index adfeeab27..b76f80890 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.118 2004/05/08 00:01:37 deraadt Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.119 2004/05/08 00:21:31 djm Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -81,7 +81,6 @@ RCSID("$OpenBSD: clientloop.c,v 1.118 2004/05/08 00:01:37 deraadt Exp $");
81#include "atomicio.h" 81#include "atomicio.h"
82#include "sshpty.h" 82#include "sshpty.h"
83#include "misc.h" 83#include "misc.h"
84#include "readpass.h"
85 84
86/* import options */ 85/* import options */
87extern Options options; 86extern Options options;
diff --git a/misc.h b/misc.h
index 45d1c0a0d..d4a23cba3 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.13 2004/05/08 00:01:37 deraadt Exp $ */ 1/* $OpenBSD: misc.h,v 1.14 2004/05/08 00:21:31 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,6 +12,8 @@
12 * called by a name other than "ssh" or "Secure Shell". 12 * called by a name other than "ssh" or "Secure Shell".
13 */ 13 */
14 14
15/* misc.c */
16
15char *chop(char *); 17char *chop(char *);
16char *strdelim(char **); 18char *strdelim(char **);
17void set_nonblock(int); 19void set_nonblock(int);
@@ -32,4 +34,14 @@ struct arglist {
32}; 34};
33void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); 35void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
34 36
37/* tildexpand.c */
38
35char *tilde_expand_filename(const char *, uid_t); 39char *tilde_expand_filename(const char *, uid_t);
40
41/* readpass.c */
42
43#define RP_ECHO 0x0001
44#define RP_ALLOW_STDIN 0x0002
45#define RP_ALLOW_EOF 0x0004
46
47char *read_passphrase(const char *, int);
diff --git a/readpass.c b/readpass.c
index 95ec5d873..fc7629c37 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,10 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: readpass.c,v 1.28 2003/01/23 13:50:27 markus Exp $"); 26RCSID("$OpenBSD: readpass.c,v 1.29 2004/05/08 00:21:31 djm Exp $");
27 27
28#include "xmalloc.h" 28#include "xmalloc.h"
29#include "readpass.h" 29#include "misc.h"
30#include "pathnames.h" 30#include "pathnames.h"
31#include "log.h" 31#include "log.h"
32#include "ssh.h" 32#include "ssh.h"
diff --git a/readpass.h b/readpass.h
deleted file mode 100644
index a45d32f2a..000000000
--- a/readpass.h
+++ /dev/null
@@ -1,19 +0,0 @@
1/* $OpenBSD: readpass.h,v 1.7 2002/03/26 15:58:46 markus Exp $ */
2
3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
5 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
6 * All rights reserved
7 *
8 * As far as I am concerned, the code I have written for this software
9 * can be used freely for any purpose. Any derived versions of this
10 * software must be clearly marked as such, and if the derived work is
11 * incompatible with the protocol description in the RFC file, it must be
12 * called by a name other than "ssh" or "Secure Shell".
13 */
14
15#define RP_ECHO 0x0001
16#define RP_ALLOW_STDIN 0x0002
17#define RP_ALLOW_EOF 0x0004
18
19char *read_passphrase(const char *, int);
diff --git a/scard.c b/scard.c
index 906287ba2..b3d25058a 100644
--- a/scard.c
+++ b/scard.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26#if defined(SMARTCARD) && defined(USE_SECTOK) 26#if defined(SMARTCARD) && defined(USE_SECTOK)
27RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); 27RCSID("$OpenBSD: scard.c,v 1.29 2004/05/08 00:21:31 djm Exp $");
28 28
29#include <openssl/evp.h> 29#include <openssl/evp.h>
30#include <sectok.h> 30#include <sectok.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $");
32#include "key.h" 32#include "key.h"
33#include "log.h" 33#include "log.h"
34#include "xmalloc.h" 34#include "xmalloc.h"
35#include "readpass.h" 35#include "misc.h"
36#include "scard.h" 36#include "scard.h"
37 37
38#if OPENSSL_VERSION_NUMBER < 0x00907000L 38#if OPENSSL_VERSION_NUMBER < 0x00907000L
diff --git a/ssh-add.c b/ssh-add.c
index e7699c95c..709a36bc1 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -47,7 +47,6 @@ RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
47#include "authfd.h" 47#include "authfd.h"
48#include "authfile.h" 48#include "authfile.h"
49#include "pathnames.h" 49#include "pathnames.h"
50#include "readpass.h"
51#include "misc.h" 50#include "misc.h"
52 51
53#ifdef HAVE___PROGNAME 52#ifdef HAVE___PROGNAME
diff --git a/ssh-agent.c b/ssh-agent.c
index f5fce6b2a..a38322160 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
35 35
36#include "includes.h" 36#include "includes.h"
37#include "openbsd-compat/sys-queue.h" 37#include "openbsd-compat/sys-queue.h"
38RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $"); 38RCSID("$OpenBSD: ssh-agent.c,v 1.118 2004/05/08 00:21:31 djm Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41#include <openssl/md5.h> 41#include <openssl/md5.h>
@@ -50,7 +50,6 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
50#include "authfd.h" 50#include "authfd.h"
51#include "compat.h" 51#include "compat.h"
52#include "log.h" 52#include "log.h"
53#include "readpass.h"
54#include "misc.h" 53#include "misc.h"
55 54
56#ifdef SMARTCARD 55#ifdef SMARTCARD
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1156a010a..2dfbb24b3 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.114 2004/05/08 00:21:31 djm Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -26,7 +26,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $");
26#include "bufaux.h" 26#include "bufaux.h"
27#include "pathnames.h" 27#include "pathnames.h"
28#include "log.h" 28#include "log.h"
29#include "readpass.h" 29#include "misc.h"
30#include "moduli.h" 30#include "moduli.h"
31 31
32#ifdef SMARTCARD 32#ifdef SMARTCARD
diff --git a/sshconnect.c b/sshconnect.c
index dfeddd39e..95bb527b2 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.157 2004/05/08 00:21:31 djm Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
31#include "readconf.h" 31#include "readconf.h"
32#include "atomicio.h" 32#include "atomicio.h"
33#include "misc.h" 33#include "misc.h"
34#include "readpass.h"
35 34
36#include "dns.h" 35#include "dns.h"
37 36
diff --git a/sshconnect1.c b/sshconnect1.c
index 2f89964ec..c579b01cc 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $"); 16RCSID("$OpenBSD: sshconnect1.c,v 1.57 2004/05/08 00:21:31 djm Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19#include <openssl/md5.h> 19#include <openssl/md5.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $");
32#include "authfd.h" 32#include "authfd.h"
33#include "sshconnect.h" 33#include "sshconnect.h"
34#include "authfile.h" 34#include "authfile.h"
35#include "readpass.h" 35#include "misc.h"
36#include "cipher.h" 36#include "cipher.h"
37#include "canohost.h" 37#include "canohost.h"
38#include "auth.h" 38#include "auth.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index 447642895..06d884285 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.137 2004/05/08 00:21:31 djm Exp $");
27 27
28#include "openbsd-compat/sys-queue.h" 28#include "openbsd-compat/sys-queue.h"
29 29
@@ -43,7 +43,7 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $");
43#include "authfd.h" 43#include "authfd.h"
44#include "log.h" 44#include "log.h"
45#include "readconf.h" 45#include "readconf.h"
46#include "readpass.h" 46#include "misc.h"
47#include "match.h" 47#include "match.h"
48#include "dispatch.h" 48#include "dispatch.h"
49#include "canohost.h" 49#include "canohost.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 03:48:09 +0000