summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-24 22:01:22 +1000
committerDamien Miller <djm@mindrot.org>2010-09-24 22:01:22 +1000
commit1ca94693180f4be6ece4056b9d3e95dc484973bb (patch)
tree63743a24d370c274cb8785a19917382bc8967e4f
parent6186bbc7fbdda96d8a5febba9e158fdf2f3f4db4 (diff)
- djm@cvs.openbsd.org 2010/09/11 21:44:20
[ssh.1] mention RFC 5656 for ECC stuff
-rw-r--r--ChangeLog3
-rw-r--r--ssh.19
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a605d86c9..99a2d4979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 * less repetition in FILES section 6 * less repetition in FILES section
7 * SSHv1 keys are still encrypted with 3DES 7 * SSHv1 keys are still encrypted with 3DES
8 help and ok jmc@ 8 help and ok jmc@
9 - djm@cvs.openbsd.org 2010/09/11 21:44:20
10 [ssh.1]
11 mention RFC 5656 for ECC stuff
9 12
1020100910 1320100910
11 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact 14 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
diff --git a/ssh.1 b/ssh.1
index 95ee85689..3209a388f 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.312 2010/09/04 09:38:34 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.313 2010/09/11 21:44:20 djm Exp $
38.Dd $Mdocdate: September 4 2010 $ 38.Dd $Mdocdate: September 11 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -1467,6 +1467,11 @@ if an error occurred.
1467.%D 2006 1467.%D 2006
1468.Re 1468.Re
1469.Rs 1469.Rs
1470.%R RFC 5656
1471.%T "Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer"
1472.%D 2009
1473.Re
1474.Rs
1470.%T "Hash Visualization: a New Technique to improve Real-World Security" 1475.%T "Hash Visualization: a New Technique to improve Real-World Security"
1471.%A A. Perrig 1476.%A A. Perrig
1472.%A D. Song 1477.%A D. Song