diff options
author | Damien Miller <djm@mindrot.org> | 2010-08-31 22:41:14 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-08-31 22:41:14 +1000 |
commit | eb8b60e320cdade9f4c07e2abacfb92c52e01348 (patch) | |
tree | 4e5bc25790566402e5b7ae00cefd2c57e867ef09 /ssh_config.5 | |
parent | da108ece6843f1268aa36d7c8ed0030dc53acd15 (diff) |
- djm@cvs.openbsd.org 2010/08/31 11:54:45
[PROTOCOL PROTOCOL.agent PROTOCOL.certkeys auth2-jpake.c authfd.c]
[authfile.c buffer.h dns.c kex.c kex.h key.c key.h monitor.c]
[monitor_wrap.c myproposal.h packet.c packet.h pathnames.h readconf.c]
[ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c]
[ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh.1 ssh.c ssh2.h]
[ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5]
[uuencode.c uuencode.h bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c]
Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and
host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer
better performance than plain DH and DSA at the same equivalent symmetric
key length, as well as much shorter keys.
Only the mandatory sections of RFC5656 are implemented, specifically the
three REQUIRED curves nistp256, nistp384 and nistp521 and only ECDH and
ECDSA. Point compression (optional in RFC5656 is NOT implemented).
Certificate host and user keys using the new ECDSA key types are supported.
Note that this code has not been tested for interoperability and may be
subject to change.
feedback and ok markus@
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index ddb806ec0..33038ffcf 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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_config.5,v 1.138 2010/08/04 05:37:01 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.139 2010/08/31 11:54:45 djm Exp $ |
38 | .Dd $Mdocdate: August 4 2010 $ | 38 | .Dd $Mdocdate: August 31 2010 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -547,7 +547,15 @@ is similar to | |||
547 | Specifies the protocol version 2 host key algorithms | 547 | Specifies the protocol version 2 host key algorithms |
548 | that the client wants to use in order of preference. | 548 | that the client wants to use in order of preference. |
549 | The default for this option is: | 549 | The default for this option is: |
550 | .Dq ssh-rsa,ssh-dss . | 550 | .Bd -literal -offset 3n |
551 | ecdsa-sha2-nistp256-cert-v01@openssh.com, | ||
552 | ecdsa-sha2-nistp384-cert-v01@openssh.com, | ||
553 | ecdsa-sha2-nistp521-cert-v01@openssh.com, | ||
554 | ssh-rsa-cert-v01@openssh.com,ssh-dss-cert-v01@openssh.com, | ||
555 | ssh-rsa-cert-v00@openssh.com,ssh-dss-cert-v00@openssh.com, | ||
556 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, | ||
557 | ssh-rsa,ssh-dss | ||
558 | .Ed | ||
551 | .It Cm HostKeyAlias | 559 | .It Cm HostKeyAlias |
552 | Specifies an alias that should be used instead of the | 560 | Specifies an alias that should be used instead of the |
553 | real host name when looking up or saving the host key | 561 | real host name when looking up or saving the host key |
@@ -583,14 +591,15 @@ offers many different identities. | |||
583 | The default is | 591 | The default is |
584 | .Dq no . | 592 | .Dq no . |
585 | .It Cm IdentityFile | 593 | .It Cm IdentityFile |
586 | Specifies a file from which the user's RSA or DSA authentication identity | 594 | Specifies a file from which the user's DSA, ECDSA or DSA authentication |
587 | is read. | 595 | identity is read. |
588 | The default is | 596 | The default is |
589 | .Pa ~/.ssh/identity | 597 | .Pa ~/.ssh/identity |
590 | for protocol version 1, and | 598 | for protocol version 1, and |
591 | .Pa ~/.ssh/id_rsa | 599 | .Pa ~/.ssh/id_dsa , |
600 | .Pa ~/.ssh/id_ecdsa | ||
592 | and | 601 | and |
593 | .Pa ~/.ssh/id_dsa | 602 | .Pa ~/.ssh/id_rsa |
594 | for protocol version 2. | 603 | for protocol version 2. |
595 | Additionally, any identities represented by the authentication agent | 604 | Additionally, any identities represented by the authentication agent |
596 | will be used for authentication. | 605 | will be used for authentication. |