summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--scp.16
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9372e4666..7e0c6722a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,10 +18,10 @@
18 - naddy@cvs.openbsd.org 2010/09/01 15:21:35 18 - naddy@cvs.openbsd.org 2010/09/01 15:21:35
19 [servconf.c] 19 [servconf.c]
20 pick up ECDSA host key by default; ok djm@ 20 pick up ECDSA host key by default; ok djm@
21 - markus@cvs.openbsd.org 2010/09/02 16:07:25 21 - markus@cvs.openbsd.org 2010/09/02 16:07:25
22 [ssh-keygen.c] 22 [ssh-keygen.c]
23 permit -b 256, 384 or 521 as key size for ECDSA; ok djm@ 23 permit -b 256, 384 or 521 as key size for ECDSA; ok djm@
24 - markus@cvs.openbsd.org 2010/09/02 16:08:39 24 - markus@cvs.openbsd.org 2010/09/02 16:08:39
25 [ssh.c] 25 [ssh.c]
26 unbreak ControlPersist=yes for ControlMaster=yes; ok djm@ 26 unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
27 - naddy@cvs.openbsd.org 2010/09/02 17:21:50 27 - naddy@cvs.openbsd.org 2010/09/02 17:21:50
@@ -29,6 +29,9 @@
29 Switch ECDSA default key size to 256 bits, which according to RFC5656 29 Switch ECDSA default key size to 256 bits, which according to RFC5656
30 should still be better than our current RSA-2048 default. 30 should still be better than our current RSA-2048 default.
31 ok djm@, markus@ 31 ok djm@, markus@
32 - jmc@cvs.openbsd.org 2010/09/03 11:09:29
33 [scp.1]
34 add an EXIT STATUS section for /usr/bin;
32 35
3320100831 3620100831
34 - OpenBSD CVS Sync 37 - OpenBSD CVS Sync
diff --git a/scp.1 b/scp.1
index bc5e259f5..82da30f4f 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.50 2010/02/08 10:50:20 markus Exp $ 12.\" $OpenBSD: scp.1,v 1.51 2010/09/03 11:09:29 jmc Exp $
13.\" 13.\"
14.Dd $Mdocdate: February 8 2010 $ 14.Dd $Mdocdate: September 3 2010 $
15.Dt SCP 1 15.Dt SCP 1
16.Os 16.Os
17.Sh NAME 17.Sh NAME
@@ -209,7 +209,7 @@ to print debugging messages about their progress.
209This is helpful in 209This is helpful in
210debugging connection, authentication, and configuration problems. 210debugging connection, authentication, and configuration problems.
211.El 211.El
212.Pp 212.Sh EXIT STATUS
213.Ex -std scp 213.Ex -std scp
214.Sh SEE ALSO 214.Sh SEE ALSO
215.Xr rcp 1 , 215.Xr rcp 1 ,