summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keysign.c2
-rw-r--r--sshd.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cf4be5449..f14d4a063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,10 @@
111 - djm@cvs.openbsd.org 2014/04/19 05:54:59 111 - djm@cvs.openbsd.org 2014/04/19 05:54:59
112 [compat.c] 112 [compat.c]
113 missing wildcard; pointed out by naddy@ 113 missing wildcard; pointed out by naddy@
114 - tedu@cvs.openbsd.org 2014/04/19 14:53:48
115 [ssh-keysign.c sshd.c]
116 Delete futile calls to RAND_seed. ok djm
117 NB. Id sync only. This only applies to OpenBSD's libcrypto slashathon
114 118
11520140401 11920140401
116 - (djm) On platforms that support it, use prctl() to prevent sftp-server 120 - (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/ssh-keysign.c b/ssh-keysign.c
index dfa89e1e2..ed24f66d1 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.40 2014/04/01 02:05:27 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.41 2014/04/19 14:53:48 tedu Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
diff --git a/sshd.c b/sshd.c
index 3ca722c5c..b955f1921 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.424 2014/04/18 23:52:25 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.425 2014/04/19 14:53:48 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland