@electerm/ssh2 1.11.2 → 1.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/client.js +141 -14
- package/lib/index.js +1 -0
- package/lib/keygen.js +582 -0
- package/lib/protocol/Protocol.js +72 -13
- package/lib/protocol/SFTP.js +190 -2
- package/lib/protocol/constants.js +5 -2
- package/lib/protocol/crypto/build/Makefile +347 -0
- package/lib/protocol/crypto/build/Release/.deps/Release/obj.target/sshcrypto/src/binding.o.d +247 -0
- package/lib/protocol/crypto/build/Release/.deps/Release/sshcrypto.node.d +1 -0
- package/lib/protocol/crypto/build/Release/obj.target/sshcrypto/src/binding.o +0 -0
- package/lib/protocol/crypto/build/Release/sshcrypto.node +0 -0
- package/lib/protocol/crypto/build/binding.Makefile +6 -0
- package/lib/protocol/crypto/build/gyp-mac-tool +772 -0
- package/lib/protocol/crypto/build/sshcrypto.target.mk +194 -0
- package/lib/protocol/handlers.misc.js +76 -5
- package/lib/protocol/kex.js +100 -23
- package/lib/protocol/keyParser.js +7 -6
- package/lib/protocol/zlib.js +6 -2
- package/lib/server.js +14 -1
- package/package.json +7 -4
package/lib/server.js
CHANGED
|
@@ -136,6 +136,7 @@ class PKAuthContext extends AuthContext {
|
|
|
136
136
|
super(protocol, username, service, method, cb);
|
|
137
137
|
|
|
138
138
|
this.key = { algo: pkInfo.keyAlgo, data: pkInfo.key };
|
|
139
|
+
this.hashAlgo = pkInfo.hashAlgo;
|
|
139
140
|
this.signature = pkInfo.signature;
|
|
140
141
|
this.blob = pkInfo.blob;
|
|
141
142
|
}
|
|
@@ -155,6 +156,7 @@ class HostbasedAuthContext extends AuthContext {
|
|
|
155
156
|
super(protocol, username, service, method, cb);
|
|
156
157
|
|
|
157
158
|
this.key = { algo: pkInfo.keyAlgo, data: pkInfo.key };
|
|
159
|
+
this.hashAlgo = pkInfo.hashAlgo;
|
|
158
160
|
this.signature = pkInfo.signature;
|
|
159
161
|
this.blob = pkInfo.blob;
|
|
160
162
|
this.localHostname = pkInfo.localHostname;
|
|
@@ -292,7 +294,11 @@ class Server extends EventEmitter {
|
|
|
292
294
|
}
|
|
293
295
|
|
|
294
296
|
const algorithms = {
|
|
295
|
-
kex: generateAlgorithmList(
|
|
297
|
+
kex: generateAlgorithmList(
|
|
298
|
+
cfgAlgos.kex,
|
|
299
|
+
DEFAULT_KEX,
|
|
300
|
+
SUPPORTED_KEX
|
|
301
|
+
).concat(['kex-strict-s-v00@openssh.com']),
|
|
296
302
|
serverHostKey: hostKeyAlgoOrder,
|
|
297
303
|
cs: {
|
|
298
304
|
cipher: generateAlgorithmList(
|
|
@@ -1316,6 +1322,13 @@ class Client extends EventEmitter {
|
|
|
1316
1322
|
this.once('rekey', cb);
|
|
1317
1323
|
}
|
|
1318
1324
|
}
|
|
1325
|
+
|
|
1326
|
+
setNoDelay(noDelay) {
|
|
1327
|
+
if (this._sock && typeof this._sock.setNoDelay === 'function')
|
|
1328
|
+
this._sock.setNoDelay(noDelay);
|
|
1329
|
+
|
|
1330
|
+
return this;
|
|
1331
|
+
}
|
|
1319
1332
|
}
|
|
1320
1333
|
|
|
1321
1334
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@electerm/ssh2",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.16.0",
|
|
4
4
|
"author": "Brian White <mscdex@mscdex.net>",
|
|
5
5
|
"description": "SSH2 client and server modules written in pure JavaScript for node.js",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -8,13 +8,16 @@
|
|
|
8
8
|
"node": ">=10.16.0"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"asn1": "^0.2.
|
|
11
|
+
"asn1": "^0.2.6",
|
|
12
12
|
"bcrypt-pbkdf": "^1.0.2"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
15
|
"@mscdex/eslint-config": "^1.1.0",
|
|
16
|
-
"eslint": "^7.
|
|
17
|
-
|
|
16
|
+
"eslint": "^7.32.0"
|
|
17
|
+
},
|
|
18
|
+
"optionalDependencies": {
|
|
19
|
+
"cpu-features": "~0.0.10",
|
|
20
|
+
"nan": "^2.20.0"
|
|
18
21
|
},
|
|
19
22
|
"scripts": {
|
|
20
23
|
"install": "node install.js",
|