[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
*/
#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"
#include "atomicio.h"
#include "sshpty.h"
#include "misc.h"
-#include "readpass.h"
/* import options */
extern Options options;
-/* $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>
* called by a name other than "ssh" or "Secure Shell".
*/
+/* misc.c */
+
char *chop(char *);
char *strdelim(char **);
void set_nonblock(int);
};
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);
*/
#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"
+++ /dev/null
-/* $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);
#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>
#include "key.h"
#include "log.h"
#include "xmalloc.h"
-#include "readpass.h"
+#include "misc.h"
#include "scard.h"
#if OPENSSL_VERSION_NUMBER < 0x00907000L
*/
#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>
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
-#include "readpass.h"
#include "misc.h"
#ifdef HAVE___PROGNAME
#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>
#include "authfd.h"
#include "compat.h"
#include "log.h"
-#include "readpass.h"
#include "misc.h"
#ifdef SMARTCARD
*/
#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>
#include "bufaux.h"
#include "pathnames.h"
#include "log.h"
-#include "readpass.h"
+#include "misc.h"
#include "moduli.h"
#ifdef SMARTCARD
*/
#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>
#include "readconf.h"
#include "atomicio.h"
#include "misc.h"
-#include "readpass.h"
#include "dns.h"
*/
#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>
#include "authfd.h"
#include "sshconnect.h"
#include "authfile.h"
-#include "readpass.h"
+#include "misc.h"
#include "cipher.h"
#include "canohost.h"
#include "auth.h"
*/
#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"
#include "authfd.h"
#include "log.h"
#include "readconf.h"
-#include "readpass.h"
+#include "misc.h"
#include "match.h"
#include "dispatch.h"
#include "canohost.h"