summaryrefslogtreecommitdiffstats
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 6f180dd2..b2285018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
[auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c
tildexpand.c], removed: sshtty.h tildexpand.h
make two tiny header files go away; djm ok
+ - djm@cvs.openbsd.org 2004/05/08 00:21:31
+ [clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c
+ sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h
+ kill a tiny header; ok deraadt@
20040502
- (dtucker) OpenBSD CVS Sync
@@ -1089,4 +1093,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3345 2004/05/13 06:06:46 dtucker Exp $
+$Id: ChangeLog,v 1.3346 2004/05/13 06:15:47 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index adfeeab2..b76f8089 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.118 2004/05/08 00:01:37 deraadt Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.119 2004/05/08 00:21:31 djm Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -81,7 +81,6 @@ RCSID("$OpenBSD: clientloop.c,v 1.118 2004/05/08 00:01:37 deraadt Exp $");
#include "atomicio.h"
#include "sshpty.h"
#include "misc.h"
-#include "readpass.h"
/* import options */
extern Options options;
diff --git a/misc.h b/misc.h
index 45d1c0a0..d4a23cba 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.13 2004/05/08 00:01:37 deraadt Exp $ */
+/* $OpenBSD: misc.h,v 1.14 2004/05/08 00:21:31 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,6 +12,8 @@
* called by a name other than "ssh" or "Secure Shell".
*/
+/* misc.c */
+
char *chop(char *);
char *strdelim(char **);
void set_nonblock(int);
@@ -32,4 +34,14 @@ struct arglist {
};
void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+/* tildexpand.c */
+
char *tilde_expand_filename(const char *, uid_t);
+
+/* readpass.c */
+
+#define RP_ECHO 0x0001
+#define RP_ALLOW_STDIN 0x0002
+#define RP_ALLOW_EOF 0x0004
+
+char *read_passphrase(const char *, int);
diff --git a/readpass.c b/readpass.c
index 95ec5d87..fc7629c3 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,10 +23,10 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.28 2003/01/23 13:50:27 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.29 2004/05/08 00:21:31 djm Exp $");
#include "xmalloc.h"
-#include "readpass.h"
+#include "misc.h"
#include "pathnames.h"
#include "log.h"
#include "ssh.h"
diff --git a/readpass.h b/readpass.h
deleted file mode 100644
index a45d32f2..00000000
--- a/readpass.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $OpenBSD: readpass.h,v 1.7 2002/03/26 15:58:46 markus Exp $ */
-
-/*
- * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- * All rights reserved
- *
- * 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".
- */
-
-#define RP_ECHO 0x0001
-#define RP_ALLOW_STDIN 0x0002
-#define RP_ALLOW_EOF 0x0004
-
-char *read_passphrase(const char *, int);
diff --git a/scard.c b/scard.c
index 906287ba..b3d25058 100644
--- a/scard.c
+++ b/scard.c
@@ -24,7 +24,7 @@
#include "includes.h"
#if defined(SMARTCARD) && defined(USE_SECTOK)
-RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $");
+RCSID("$OpenBSD: scard.c,v 1.29 2004/05/08 00:21:31 djm Exp $");
#include <openssl/evp.h>
#include <sectok.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $");
#include "key.h"
#include "log.h"
#include "xmalloc.h"
-#include "readpass.h"
+#include "misc.h"
#include "scard.h"
#if OPENSSL_VERSION_NUMBER < 0x00907000L
diff --git a/ssh-add.c b/ssh-add.c
index e7699c95..709a36bc 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
#include <openssl/evp.h>
@@ -47,7 +47,6 @@ RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
-#include "readpass.h"
#include "misc.h"
#ifdef HAVE___PROGNAME
diff --git a/ssh-agent.c b/ssh-agent.c
index f5fce6b2..a3832216 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
#include "includes.h"
#include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.118 2004/05/08 00:21:31 djm Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -50,7 +50,6 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
#include "authfd.h"
#include "compat.h"
#include "log.h"
-#include "readpass.h"
#include "misc.h"
#ifdef SMARTCARD
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1156a010..2dfbb24b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.114 2004/05/08 00:21:31 djm Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -26,7 +26,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $");
#include "bufaux.h"
#include "pathnames.h"
#include "log.h"
-#include "readpass.h"
+#include "misc.h"
#include "moduli.h"
#ifdef SMARTCARD
diff --git a/sshconnect.c b/sshconnect.c
index dfeddd39..95bb527b 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.157 2004/05/08 00:21:31 djm Exp $");
#include <openssl/bn.h>
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
#include "readconf.h"
#include "atomicio.h"
#include "misc.h"
-#include "readpass.h"
#include "dns.h"
diff --git a/sshconnect1.c b/sshconnect1.c
index 2f89964e..c579b01c 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.57 2004/05/08 00:21:31 djm Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $");
#include "authfd.h"
#include "sshconnect.h"
#include "authfile.h"
-#include "readpass.h"
+#include "misc.h"
#include "cipher.h"
#include "canohost.h"
#include "auth.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index 44764289..06d88428 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.137 2004/05/08 00:21:31 djm Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -43,7 +43,7 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $");
#include "authfd.h"
#include "log.h"
#include "readconf.h"
-#include "readpass.h"
+#include "misc.h"
#include "match.h"
#include "dispatch.h"
#include "canohost.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 13:16:33 +0000