Address keybase/keybase-issues#921.

I didn't track it all the way down, but there's an issue with browserify-zlib decrypting our fake ZIP archives. When the "flush" is sent with 0 in bytes, it returns a Z_BUF_ERROR, as if it still wants more data. I think it's safe to ignore this error, but we should recheck this assumption. If we turn out to be wrong, we might need to call into pako directly as shown above. Calling into pako directly has problems, though, since it will be included in the node.js setting which will increase code bloat.
keybase · Aug 6, 2014 · 854df76 · 854df76
1 parent f83e395
commit 854df76
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 43 deletions.
diff --git a/lib/keymanager.js b/lib/keymanager.js
diff --git a/lib/openpgp/packet/compressed.js b/lib/openpgp/packet/compressed.js
diff --git a/src/keymanager.iced b/src/keymanager.iced
@@ -436,7 +436,8 @@ class KeyManager extends KeyFetcher
 
   # Start from an armored PGP PUBLIC KEY BLOCK, and parse it into packets.
   # Also works for an armored PGP PRIVATE KEY BLOCK
-  @import_from_armored_pgp : ({raw, asp}, cb) ->
+  @import_from_armored_pgp : ({armored, raw, asp}, cb) ->
+    raw or= armored
     asp = ASP.make asp
     warnings = null
     ret = null