@electerm/ssh2 1.10.0 → 1.11.2

package/lib/client.js

@@ -402,7 +402,17 @@ class Client extends EventEmitter {
             });
           } else if (curAuth.type === 'publickey') {
             proto.authPK(curAuth.username, curAuth.key, (buf, cb) => {
-              const signature = curAuth.key.sign(buf);
+              let signatureAlgo;
+              if (curAuth.key.type === 'ssh-rsa') {
+                if (this._protocol._remoteHostKeyAlgorithms
+                    .includes('rsa-sha2-512')) {
+                  signatureAlgo = 'sha512';
+                } else if (this._protocol._remoteHostKeyAlgorithms
+                    .includes('rsa-sha2-256')) {
+                  signatureAlgo = 'sha256';
+                }
+              }
+              const signature = curAuth.key.sign(buf, signatureAlgo);
               if (signature instanceof Error) {
                 signature.message =
                   `Error signing data with key: ${signature.message}`;

package/lib/protocol/Protocol.js

@@ -616,7 +616,15 @@ class Protocol {
     if (pubKey instanceof Error)
       throw new Error('Invalid key');
 
-    const keyType = pubKey.type;
+    let keyType = pubKey.type;
+    if (keyType === 'ssh-rsa') {
+      for (const algo of ['rsa-sha2-512', 'rsa-sha2-256']) {
+        if (this._remoteHostKeyAlgorithms.includes(algo)) {
+          keyType = algo;
+          break;
+        }
+      }
+    }
     pubKey = pubKey.getPublicSSH();
 
     const userLen = Buffer.byteLength(username);

package/lib/protocol/crypto/src/binding.cc

@@ -10,9 +10,9 @@
 #include <string.h>
 #include <assert.h>
 
+DISABLE_WCAST_FUNCTION_TYPE
 #include <node.h>
 #include <node_buffer.h>
-DISABLE_WCAST_FUNCTION_TYPE
 #include <nan.h>
 DISABLE_WCAST_FUNCTION_TYPE_END
 
@@ -2221,37 +2221,45 @@ NAN_MODULE_INIT(init) {
 #else
 #  define load_sym(name) dlsym(RTLD_DEFAULT, name)
 #endif
-  ctx_iv_len = reinterpret_cast<ctx_iv_len_func>(
-    load_sym("EVP_CIPHER_CTX_get_iv_length")
-  );
   if (!ctx_iv_len) {
     ctx_iv_len = reinterpret_cast<ctx_iv_len_func>(
-      load_sym("EVP_CIPHER_CTX_iv_length")
+      load_sym("EVP_CIPHER_CTX_get_iv_length")
     );
+    if (!ctx_iv_len) {
+      ctx_iv_len = reinterpret_cast<ctx_iv_len_func>(
+        load_sym("EVP_CIPHER_CTX_iv_length")
+      );
+    }
   }
-  ctx_key_len = reinterpret_cast<ctx_key_len_func>(
-    load_sym("EVP_CIPHER_CTX_get_key_length")
-  );
   if (!ctx_key_len) {
     ctx_key_len = reinterpret_cast<ctx_key_len_func>(
-      load_sym("EVP_CIPHER_CTX_key_length")
+      load_sym("EVP_CIPHER_CTX_get_key_length")
     );
+    if (!ctx_key_len) {
+      ctx_key_len = reinterpret_cast<ctx_key_len_func>(
+        load_sym("EVP_CIPHER_CTX_key_length")
+      );
+    }
   }
-  cipher_flags = reinterpret_cast<cipher_flags_func>(
-    load_sym("EVP_CIPHER_get_flags")
-  );
   if (!cipher_flags) {
     cipher_flags = reinterpret_cast<cipher_flags_func>(
-      load_sym("EVP_CIPHER_flags")
+      load_sym("EVP_CIPHER_get_flags")
     );
+    if (!cipher_flags) {
+      cipher_flags = reinterpret_cast<cipher_flags_func>(
+        load_sym("EVP_CIPHER_flags")
+      );
+    }
   }
-  ctx_get_block_size = reinterpret_cast<ctx_get_block_size_func>(
-    load_sym("EVP_CIPHER_CTX_get_block_size")
-  );
   if (!ctx_get_block_size) {
     ctx_get_block_size = reinterpret_cast<ctx_get_block_size_func>(
-      load_sym("EVP_CIPHER_CTX_block_size")
+      load_sym("EVP_CIPHER_CTX_get_block_size")
     );
+    if (!ctx_get_block_size) {
+      ctx_get_block_size = reinterpret_cast<ctx_get_block_size_func>(
+        load_sym("EVP_CIPHER_CTX_block_size")
+      );
+    }
   }
 
   ChaChaPolyCipher::Init(target);
@@ -2264,5 +2272,5 @@ NAN_MODULE_INIT(init) {
 }
 
 DISABLE_WCAST_FUNCTION_TYPE
-NODE_MODULE(sshcrypto, init)
+NAN_MODULE_WORKER_ENABLED(sshcrypto, init)
 DISABLE_WCAST_FUNCTION_TYPE_END

package/lib/protocol/kex.js

@@ -196,7 +196,7 @@ function handleKexInit(self, payload) {
 
   const local = self._offer;
   const remote = init;
-
+  self._remoteHostKeyAlgorithms = remote.serverHostKey;
   let localKex = local.lists.kex.array;
   if (self._compatFlags & COMPAT.BAD_DHGEX) {
     let found = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/ssh2",
-  "version": "1.10.0",
+  "version": "1.11.2",
   "author": "Brian White <mscdex@mscdex.net>",
   "description": "SSH2 client and server modules written in pure JavaScript for node.js",
   "main": "./lib/index.js",
@@ -12,8 +12,9 @@
     "bcrypt-pbkdf": "^1.0.2"
   },
   "devDependencies": {
-    "@mscdex/eslint-config": "^1.0.0",
-    "eslint": "^7.0.0"
+    "@mscdex/eslint-config": "^1.1.0",
+    "eslint": "^7.0.0",
+    "nan": "^2.16.0"
   },
   "scripts": {
     "install": "node install.js",