ssh2 - npm Package Compare versions

Comparing version 0.2.10 to 0.2.11

lib/keyParser.js

@@ -6,3 +6,3 @@ // TODO: handle multi-line header values
     RE_FOOTER_OPENSSH_PRIV = /^-----END (?:RSA|DSA) PRIVATE KEY-----$/i,
-    RE_HEADER_OPENSSH_PUB = /^ssh-(rsa|dss) ([A-Z0-9a-z\/+=]+(?:$|\s+([\S].*)?)$)/i,
+    RE_HEADER_OPENSSH_PUB = /^(ssh-(rsa|dss)(?:-cert-v0[01]@openssh.com)?) ([A-Z0-9a-z\/+=]+(?:$|\s+([\S].*)?)$)/i,
     RE_HEADER_RFC4176_PUB = /^---- BEGIN SSH2 PUBLIC KEY ----$/i,
@@ -19,2 +19,3 @@ RE_FOOTER_RFC4176_PUB = /^---- END SSH2 PUBLIC KEY ----$/i,
   var ret = {
+    fulltype: undefined,
     type: undefined,
@@ -94,6 +95,7 @@ extra: undefined,
     // OpenSSH public key
-    ret.type = m[1].toLowerCase();
-    ret.public = new Buffer(m[2], 'base64');
+    ret.fulltype = m[1];
+    ret.type = m[2].toLowerCase();
+    ret.public = new Buffer(m[3], 'base64');
     ret.publicOrig = new Buffer(orig);
-    ret.comment = m[3];
+    ret.comment = m[4];
   } else if ((m = RE_HEADER_RFC4176_PUB.exec(data[0]))
@@ -123,13 +125,10 @@ && RE_FOOTER_RFC4176_PUB.test(data[data.length - 1])) {
     len = ret.public.readUInt32BE(0, true);
-    if (len !== 7)
+    var fulltype = ret.public.toString('ascii', 4, 4 + len);
+    ret.fulltype = fulltype;
+    if (fulltype === 'ssh-dss')
+      ret.type = 'dss';
+    else if (fulltype === 'ssh-rsa')
+      ret.type = 'rsa';
+    else
       return false;
-    else {
-      var type = ret.public.toString('ascii', 4, 11);
-      if (type === 'ssh-dss')
-        ret.type = 'dss';
-      else if (type === 'ssh-rsa')
-        ret.type = 'rsa';
-      else
-        return false;
-    }
     ret.public = ret.public.slice(11);
@@ -141,2 +140,2 @@ ret.publicOrig = new Buffer(orig);
   return ret;
-};
+};

lib/SFTP/SFTPv3.js

@@ -1700,3 +1700,2 @@ var EventEmitter = require('events').EventEmitter,
       self.bytesWritten += arg1;
-      self.pos += arg1;
       cb && cb(undefined, arg1);
@@ -1703,0 +1702,0 @@ } else if (method === self._sftp.open) {

package.json

 { "name": "ssh2",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "author": "Brian White <[e-mail]>",
@@ -4,0 +4,0 @@ "description": "An SSH2 client module written in pure JavaScript for node.js",

No alert changes

Improved metrics

Total package byte prevSize

263097

increased by0.05%

Lines of code

5344

increased by0.06%

No dependency changes