From f278613f5e3f6d3577a21004c09ef4a2f720bbb5 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sun, 6 May 2001 18:01:43 +0000 Subject: [PATCH] - (bal) CVS ID updates for readpass.c, readpass.h, cli.c, and cli.h --- ChangeLog | 3 ++- cli.c | 4 ++-- cli.h | 11 +++++------ readpass.c | 2 +- readpass.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fd3e7b5d..6e4e82b77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Suggested by Jason Mader - (bal) White Space and #ifdef sync with OpenBSD - (bal) Add 'seed_rng()' to ssh-add.c + - (bal) CVS ID updates for readpass.c, readpass.h, cli.c, and cli.h - OpenBSD CVS Sync - stevesk@cvs.openbsd.org 2001/05/05 13:42:52 [sftp.1 ssh-add.1 ssh-keygen.1] @@ -5353,4 +5354,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1203 2001/05/06 03:01:02 mouring Exp $ +$Id: ChangeLog,v 1.1204 2001/05/06 18:01:43 mouring Exp $ diff --git a/cli.c b/cli.c index d0f0cf3ff..4adde4bea 100644 --- a/cli.c +++ b/cli.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $ */ +/* $OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cli.c,v 1.11 2001/03/06 00:33:04 deraadt Exp $"); +RCSID("$OpenBSD: cli.c,v 1.12 2001/05/06 17:52:07 mouring Exp $"); #include "xmalloc.h" #include "log.h" diff --git a/cli.h b/cli.h index bf263dbd2..e8f92e900 100644 --- a/cli.h +++ b/cli.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ +/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $OpenBSD: cli.h,v 1.4 2001/03/01 03:38:33 deraadt Exp $ */ +/* $OpenBSD: cli.h,v 1.5 2001/05/06 17:52:07 mouring Exp $ */ #ifndef CLI_H #define CLI_H @@ -35,9 +35,8 @@ * of response depending on arg. Tries to ensure that no other userland * buffer is storing the response. */ -char* cli_read_passphrase(const char* prompt, int from_stdin, - int echo_enable); -char* cli_prompt(char* prompt, int echo_enable); -void cli_mesg(char* mesg); +char* cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable); +char* cli_prompt(char* prompt, int echo_enable); +void cli_mesg(char* mesg); #endif /* CLI_H */ diff --git a/readpass.c b/readpass.c index c1b9a7064..d059272e7 100644 --- a/readpass.c +++ b/readpass.c @@ -32,7 +32,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readpass.c,v 1.16 2001/05/02 01:25:39 mouring Exp $"); +RCSID("$OpenBSD: readpass.c,v 1.17 2001/05/06 17:52:07 mouring Exp $"); #include "xmalloc.h" #include "cli.h" diff --git a/readpass.h b/readpass.h index 38d11af6b..55ed294da 100644 --- a/readpass.h +++ b/readpass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.h,v 1.2 2001/01/29 01:58:17 niklas Exp $ */ +/* $OpenBSD: readpass.h,v 1.3 2001/05/06 17:52:08 mouring Exp $ */ /* * Author: Tatu Ylonen