summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keysign.c2
-rw-r--r--ssh.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 924ce95f6..bc17d1fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
9 - djm@cvs.openbsd.org 2004/08/23 11:48:47 9 - djm@cvs.openbsd.org 2004/08/23 11:48:47
10 [channels.c] 10 [channels.c]
11 typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus 11 typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus
12 - dtucker@cvs.openbsd.org 2004/08/23 14:26:38
13 [ssh-keysign.c ssh.c]
14 Use permanently_set_uid() in ssh and ssh-keysign for consistency, matches
15 change in Portable; ok markus@ (CVS ID sync only)
12 16
1320040828 1720040828
14 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from 18 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1676,4 +1680,4 @@
1676 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1680 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1677 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1681 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1678 1682
1679$Id: ChangeLog,v 1.3524 2004/08/29 06:29:44 dtucker Exp $ 1683$Id: ChangeLog,v 1.3525 2004/08/29 06:31:28 dtucker Exp $
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 517655790..1b1149aad 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: ssh-keysign.c,v 1.16 2004/04/18 23:10:26 djm Exp $"); 25RCSID("$OpenBSD: ssh-keysign.c,v 1.17 2004/08/23 14:26:38 dtucker Exp $");
26 26
27#include <openssl/evp.h> 27#include <openssl/evp.h>
28#include <openssl/rand.h> 28#include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 1419f9874..e69d73807 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.224 2004/07/28 09:40:29 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.225 2004/08/23 14:26:38 dtucker Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>