From d995e7ddd73ae21eb4f84afd92320b0fe2a5e0c1 Mon Sep 17 00:00:00 2001 From: billchurch Date: Fri, 26 May 2017 17:30:41 -0400 Subject: [PATCH] updated documentation and version --- README.md | 34 +++++++++------------------------- config.json | 23 ++++++++++++++++------- package.json | 2 +- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 438ea35..0332bfe 100644 --- a/README.md +++ b/README.md @@ -85,20 +85,21 @@ config.json contains several options which may be specified to customize to your 1. aes128-ctr 2. aes192-ctr 3. aes256-ctr - 4. aes128-gcm **(node v0.11.12 or newer)** - 5. aes128-gcm@openssh.com **(node v0.11.12 or newer)** - 6. aes256-gcm **(node v0.11.12 or newer)** - 7. aes256-gcm@openssh.com **(node v0.11.12 or newer)** + 4. aes128-gcm + 5. aes128-gcm@openssh.com + 6. aes256-gcm + 7. aes256-gcm@openssh.com + 8. aes256-cbc * Supported values: * aes128-ctr * aes192-ctr * aes256-ctr - * aes128-gcm **(node v0.11.12 or newer)** - * aes128-gcm@openssh.com **(node v0.11.12 or newer)** - * aes256-gcm **(node v0.11.12 or newer)** - * aes256-gcm@openssh.com **(node v0.11.12 or newer)** + * aes128-gcm + * aes128-gcm@openssh.com + * aes256-gcm + * aes256-gcm@openssh.com * aes256-cbc * aes192-cbc * aes128-cbc @@ -109,23 +110,6 @@ config.json contains several options which may be specified to customize to your * cast128-cbc * arcfour - * **serverHostKey** - _array_ - Server host key formats. In server mode, this list must agree with the host private keys set in the `hostKeys` config setting. - - * Default values: - - 1. ssh-rsa - 2. ecdsa-sha2-nistp256 **(node v5.2.0 or newer)** - 3. ecdsa-sha2-nistp384 **(node v5.2.0 or newer)** - 4. ecdsa-sha2-nistp521 **(node v5.2.0 or newer)** - - * Supported values: - - * ssh-rsa - * ecdsa-sha2-nistp256 **(node v5.2.0 or newer)** - * ecdsa-sha2-nistp384 **(node v5.2.0 or newer)** - * ecdsa-sha2-nistp521 **(node v5.2.0 or newer)** - * ssh-dss - * **hmac** - _array_ - (H)MAC algorithms. * Default values: diff --git a/config.json b/config.json index 1083601..80cfba2 100644 --- a/config.json +++ b/config.json @@ -24,18 +24,27 @@ "challengeButton": true }, "algorithms": { + "kex": [ + "ecdh-sha2-nistp256", + "ecdh-sha2-nistp384", + "ecdh-sha2-nistp521", + "diffie-hellman-group-exchange-sha256", + "diffie-hellman-group14-sha1" + ], "cipher": [ - "aes128-cbc", - "3des-cbc", - "aes256-cbc", "aes128-ctr", "aes192-ctr", - "aes256-ctr" + "aes256-ctr", + "aes128-gcm", + "aes128-gcm@openssh.com", + "aes256-gcm", + "aes256-gcm@openssh.com", + "aes256-cbc" // for some legacy systems ], "hmac": [ - "hmac-sha1", - "hmac-sha1-96", - "hmac-md5-96" + "hmac-sha2-256", + "hmac-sha2-512", + "hmac-sha1" // for some legacy systems ] } } \ No newline at end of file diff --git a/package.json b/package.json index 035f8e2..b9bdf3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "WebSSH2", - "version": "0.0.5", + "version": "0.1.0", "ignore": [ ".gitignore" ],