keybase-proofs 2.3.33 → 2.3.34

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.3.34 (2026-09-22)
+
+- Remove web of trust proof classes.
+- Various parsing and schema verification fixes.
+
 ## 2.3.33 (2026-06-02)
 
 - Fix Twitter search query. We must not search for Keybase.io anymore when

package/Makefile

@@ -48,7 +48,6 @@ $(BUILD_STAMP): \
 	lib/track.js \
 	lib/wallet.js \
 	lib/web_service.js \
-	lib/wot.js \
 	lib/update_passphrase_hash.js \
 	lib/update_settings.js \
 	lib/util.js

package/lib/alloc.js

@@ -1,6 +1,6 @@
-// Generated by IcedCoffeeScript 108.0.12
+// Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var Announcement, Auth, Cryptocurrency, Device, Eldest, PGPUpdate, PerUserKey, Revoke, Sibkey, Stellar, Subkey, Track, Untrack, UpdatePassphraseHash, UpdateSettings, alloc, base, get_klass, lookup_tab, team, team_hidden, web_service, wot, _ref;
+  var Announcement, Auth, Cryptocurrency, Device, Eldest, PGPUpdate, PerUserKey, Revoke, Sibkey, Stellar, Subkey, Track, Untrack, UpdatePassphraseHash, UpdateSettings, alloc, base, get_klass, get_own, lookup_tab, team, team_hidden, web_service, _ref;
 
   web_service = require('./web_service');
 
@@ -34,12 +34,12 @@
 
   UpdateSettings = require('./update_settings').UpdateSettings;
 
+  get_own = require('./util').get_own;
+
   team = require('./team');
 
   team_hidden = require('./team_hidden');
 
-  wot = require('./wot');
-
   lookup_tab = {
     "web_service_binding.twitter": web_service.TwitterBinding,
     "web_service_binding.facebook": web_service.FacebookBinding,
@@ -82,15 +82,13 @@
     "team.delete_up_pointer": team.DeleteUpPointer,
     "team.kbfs": team.KBFS,
     "team.settings": team.Settings,
-    "team.bot_settings": team.BotSettings,
-    "wot.vouch": wot.Vouch,
-    "wot.react": wot.React
+    "team.bot_settings": team.BotSettings
   };
 
   get_klass = function(type, extra_lookup_tab) {
     var err, klass;
     err = klass = null;
-    if (!(((klass = extra_lookup_tab != null ? extra_lookup_tab[type] : void 0) != null) || ((klass = lookup_tab[type]) != null))) {
+    if (!(((extra_lookup_tab != null) && ((klass = get_own(extra_lookup_tab, type)) != null)) || ((klass = get_own(lookup_tab, type)) != null))) {
       err = new Error("Unknown proof class: " + type);
     }
     return [err, klass];

package/lib/main.js

@@ -2,7 +2,7 @@
 (function() {
   var k, m, mods, v, _i, _len;
 
-  mods = [require('./web_service'), require('./b64extract'), require('./util'), require('./alloc'), require('./alloc3'), require('./constants'), require('./base'), require('./track'), require('./auth'), require('./update_passphrase_hash'), require('./update_settings'), require('./device'), require('./revoke'), require('./cryptocurrency'), require('./per_user_key'), require('./wallet'), require('./subkey'), require('./sibkey'), require('./eldest'), require('./pgp_update'), require('./announcement'), require('./scrapers/twitter'), require('./scrapers/facebook'), require('./scrapers/base'), require('./scrapers/github'), require('./scrapers/reddit'), require('./scrapers/generic_web_site'), require('./scrapers/dns'), require('./scrapers/coinbase'), require('./scrapers/hackernews'), require('./scrapers/generic_social'), require('./errors'), require('./wot')];
+  mods = [require('./web_service'), require('./b64extract'), require('./util'), require('./alloc'), require('./alloc3'), require('./constants'), require('./base'), require('./track'), require('./auth'), require('./update_passphrase_hash'), require('./update_settings'), require('./device'), require('./revoke'), require('./cryptocurrency'), require('./per_user_key'), require('./wallet'), require('./subkey'), require('./sibkey'), require('./eldest'), require('./pgp_update'), require('./announcement'), require('./scrapers/twitter'), require('./scrapers/facebook'), require('./scrapers/base'), require('./scrapers/github'), require('./scrapers/reddit'), require('./scrapers/generic_web_site'), require('./scrapers/dns'), require('./scrapers/coinbase'), require('./scrapers/hackernews'), require('./scrapers/generic_social'), require('./errors')];
 
   for (_i = 0, _len = mods.length; _i < _len; _i++) {
     m = mods[_i];
@@ -20,6 +20,4 @@
 
   exports.schema = require('./schema3');
 
-  exports.wot = require('./wot');
-
 }).call(this);

package/lib/parse3.js

@@ -1,6 +1,6 @@
-// Generated by IcedCoffeeScript 108.0.12
+// Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var bufeq_fast, constants, is_dict, is_hex, is_int, pack, unpack, unpack_strict,
+  var bufeq_fast, constants, decode_hex, is_dict, is_hex, is_int, pack, unpack, unpack_strict,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   unpack = require('purepack').unpack;
@@ -45,13 +45,27 @@
     return typeof s === 'number' && (n !== Infinity) && (n === s) && n >= 0;
   };
 
+  exports.decode_hex = decode_hex = function(s) {
+    var buf;
+    if (typeof s !== 'string') {
+      return null;
+    }
+    buf = Buffer.from(s, 'hex');
+    if (buf.toString('hex') !== s.toLowerCase()) {
+      return null;
+    }
+    return buf;
+  };
+
   exports.is_hex = is_hex = function(h, l) {
     if (h == null) {
       return false;
     }
     if (typeof h === 'string') {
-      h = Buffer.from(h, 'hex');
-    } else if (!Buffer.isBuffer) {
+      if ((h = decode_hex(h)) == null) {
+        return false;
+      }
+    } else if (!Buffer.isBuffer(h)) {
       return false;
     }
     return h.length === l;
@@ -167,12 +181,13 @@
   };
 
   exports.unhex = function(b) {
+    var h;
     if (b == null) {
       return null;
     } else if (Buffer.isBuffer(b)) {
       return b;
-    } else if (typeof b === 'string') {
-      return Buffer.from(b, 'hex');
+    } else if (typeof b === 'string' && ((h = decode_hex(b)) != null)) {
+      return h;
     } else {
       throw new Error("bad binary or hex string");
     }

package/lib/schema3.js

@@ -1,16 +1,22 @@
-// Generated by IcedCoffeeScript 108.0.12
+// Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var Array, Binary, Bool, ChainType, Dict, Int, KID, LinkType, Node, Object, Or, Path, PtkType, Seqno, String, StringEnum, Struct, Time, Value, mkerr, parse,
+  var Array, Binary, Bool, ChainType, Dict, Int, KID, LinkType, Node, Object, Or, Path, PtkType, Seqno, String, StringEnum, Struct, Time, Value, get_own, has_own, is_reserved_key_name, mkerr, parse, _ref,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   parse = require('./parse3');
 
+  _ref = require('./util'), has_own = _ref.has_own, get_own = _ref.get_own;
+
   mkerr = function(path, err) {
     return new Error("At " + (path.toString()) + ": " + err);
   };
 
+  is_reserved_key_name = function(k) {
+    return k === '__proto__';
+  };
+
   Path = (function() {
     function Path(v) {
       this._v = v || [];
@@ -84,7 +90,7 @@
         return null;
       }
       if (obj == null) {
-        mkerr(path, "value cannot be null");
+        return mkerr(path, "value cannot be null");
       }
       return checker._check({
         path: path,
@@ -100,15 +106,20 @@
     __extends(Dict, _super);
 
     function Dict(_arg) {
-      var keys;
+      var k, keys;
       keys = _arg.keys;
+      for (k in keys) {
+        if (is_reserved_key_name(k)) {
+          throw new Error("schema key name is not allowed: " + k);
+        }
+      }
       this._keys = keys;
       this._allow_extra_keys = false;
       Dict.__super__.constructor.apply(this, arguments);
     }
 
     Dict.prototype._check = function(_arg) {
-      var checker, err, k, new_path, obj, path, v, _ref;
+      var checker, err, k, new_path, obj, path, v, _ref1;
       path = _arg.path, obj = _arg.obj;
       if (!parse.is_dict(obj)) {
         return mkerr(path, "need a dictionary");
@@ -116,7 +127,10 @@
       for (k in obj) {
         v = obj[k];
         new_path = path.extend(k);
-        if ((checker = this._keys[k]) == null) {
+        if (is_reserved_key_name(k)) {
+          return mkerr(new_path, "key name is not allowed");
+        }
+        if ((checker = get_own(this._keys, k)) == null) {
           if (this._allow_extra_keys) {
             continue;
           }
@@ -130,11 +144,11 @@
           return err;
         }
       }
-      _ref = this._keys;
-      for (k in _ref) {
-        v = _ref[k];
+      _ref1 = this._keys;
+      for (k in _ref1) {
+        v = _ref1[k];
         new_path = path.extend(k);
-        if ((obj[k] == null) && !v.is_optional()) {
+        if (!has_own(obj, k) && !v.is_optional()) {
           return mkerr(new_path, "key is missing but is mandatory");
         }
       }
@@ -142,12 +156,12 @@
     };
 
     Dict.prototype.debug_localize = function(obj) {
-      var k, ret, v, _ref;
+      var k, ret, v, _ref1;
       ret = {};
-      _ref = this._keys;
-      for (k in _ref) {
-        v = _ref[k];
-        if (obj[k] != null) {
+      _ref1 = this._keys;
+      for (k in _ref1) {
+        v = _ref1[k];
+        if (has_own(obj, k)) {
           ret[v._name || k] = v.debug_localize(obj[k]);
         }
       }
@@ -155,6 +169,9 @@
     };
 
     Dict.prototype.set_key = function(k, v) {
+      if (is_reserved_key_name(k)) {
+        throw new Error("schema key name is not allowed: " + k);
+      }
       return this._keys[k] = v;
     };
 
@@ -282,7 +299,7 @@
       var bot, obj, path;
       path = _arg.path, obj = _arg.obj;
       if (this._convert && typeof obj === 'string') {
-        obj = Buffer.from(obj, 'hex');
+        obj = parse.decode_hex(obj);
       }
       if (!(Buffer.isBuffer(obj) && obj.length === this._len)) {
         return [mkerr(path, "value needs to be buffer of length " + this._len), null];
@@ -297,12 +314,12 @@
     };
 
     Binary.prototype._check = function(_arg) {
-      var err, obj, path, _, _ref;
+      var err, obj, path, _, _ref1;
       path = _arg.path, obj = _arg.obj;
-      _ref = this._convert_and_check({
+      _ref1 = this._convert_and_check({
         path: path,
         obj: obj
-      }), err = _ref[0], _ = _ref[1];
+      }), err = _ref1[0], _ = _ref1[1];
       return err;
     };
 
@@ -321,17 +338,17 @@
     }
 
     KID.prototype._check = function(_arg) {
-      var err, obj, path, typ, _ref, _ref1;
+      var err, obj, path, typ, _ref1, _ref2;
       path = _arg.path, obj = _arg.obj;
-      _ref = this._convert_and_check({
+      _ref1 = this._convert_and_check({
         path: path,
         obj: obj
-      }), err = _ref[0], obj = _ref[1];
+      }), err = _ref1[0], obj = _ref1[1];
       if (err != null) {
         return err;
       }
       typ = this._encryption ? [0x21] : [0x20, 0x01, 0x11, 0x13, 0x16];
-      if ((obj[0] !== 0x01) || (_ref1 = obj[1], __indexOf.call(typ, _ref1) < 0) || (obj.slice(-1)[0] !== 0x0a)) {
+      if ((obj[0] !== 0x01) || (_ref2 = obj[1], __indexOf.call(typ, _ref2) < 0) || (obj.slice(-1)[0] !== 0x0a)) {
         return mkerr(path, "value must be a KID" + (this._encryption ? ' (for encryption)' : ''));
       }
       return null;
@@ -431,12 +448,12 @@
     }
 
     String.prototype._check = function(_arg) {
-      var max_length, obj, path, _ref;
+      var max_length, obj, path, _ref1;
       path = _arg.path, obj = _arg.obj;
       if (typeof obj !== 'string' || obj.length === 0) {
         return mkerr(path, "value must be a string");
       }
-      if ((max_length = (_ref = this._args) != null ? _ref.max_length : void 0) != null) {
+      if ((max_length = (_ref1 = this._args) != null ? _ref1.max_length : void 0) != null) {
         if (obj.length > max_length) {
           return mkerr(path, "value length needs to be < " + max_length);
         }
@@ -457,6 +474,9 @@
       this._values = {};
       for (_i = 0, _len = values.length; _i < _len; _i++) {
         v = values[_i];
+        if (is_reserved_key_name(v)) {
+          throw new Error("enum value is not allowed: " + v);
+        }
         this._values[v] = true;
       }
     }
@@ -467,7 +487,7 @@
       if (typeof obj !== 'string') {
         return mkerr(path, "value must be a string");
       }
-      if (!this._values[obj]) {
+      if (!has_own(this._values, obj)) {
         return mkerr(path, "unknown enum value (" + obj + ")");
       }
       return null;
@@ -567,13 +587,13 @@
     }
 
     Or.prototype._check = function(_arg) {
-      var obj, ok, path, t, _i, _len, _ref;
+      var obj, ok, path, t, _i, _len, _ref1;
       path = _arg.path, obj = _arg.obj;
       ok = false;
-      _ref = this._terms;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        t = _ref[_i];
-        if (!(t.check(obj))) {
+      _ref1 = this._terms;
+      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+        t = _ref1[_i];
+        if (!(!t.check(obj))) {
           continue;
         }
         ok = true;

package/lib/scrapers/twitter.js

@@ -113,7 +113,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
             funcname: "TwitterScraper.hunt2"
           });
           _this._get_body_api({
@@ -174,7 +174,7 @@
     };
 
     TwitterScraper.prototype.users_lookup = function(_arg, cb) {
-      var batch_size, cursor_wait, dict, done, err, i, identifier, ids, include_entities, input_list, j, json, key, query, r, rc, res, responses, screen_names, u, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var batch_size, cursor_wait, done, err, i, identifier, ids, include_entities, input_list, j, json, key, map, query, r, rc, res, responses, screen_names, u, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
       ids = _arg.ids, screen_names = _arg.screen_names, cursor_wait = _arg.cursor_wait, include_entities = _arg.include_entities;
@@ -222,7 +222,7 @@
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
                   funcname: "TwitterScraper.users_lookup"
                 });
                 _this._get_body_api({
@@ -265,7 +265,7 @@
                                 (function(__iced_k) {
                                   __iced_deferrals = new iced.Deferrals(__iced_k, {
                                     parent: ___iced_passed_deferral,
-                                    filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+                                    filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
                                     funcname: "TwitterScraper.users_lookup"
                                   });
                                   setTimeout(__iced_deferrals.defer({
@@ -294,16 +294,16 @@
         return function() {
           var _i, _j, _len, _len1;
           if (responses != null ? responses.length : void 0) {
-            dict = {};
+            map = new Map;
             key = ids != null ? "id_str" : "screen_name";
             for (_i = 0, _len = responses.length; _i < _len; _i++) {
               r = responses[_i];
-              dict[r[key]] = r;
+              map.set(String(r[key]), r);
             }
             res = [];
             for (i = _j = 0, _len1 = input_list.length; _j < _len1; i = ++_j) {
               identifier = input_list[i];
-              res[i] = dict[identifier] || null;
+              res[i] = map.get(String(identifier)) || null;
             }
           }
           return cb(err, res);
@@ -351,7 +351,7 @@
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
                   funcname: "TwitterScraper.get_follower_ids"
                 });
                 _this._get_body_api({
@@ -397,7 +397,7 @@
                                 (function(__iced_k) {
                                   __iced_deferrals = new iced.Deferrals(__iced_k, {
                                     parent: ___iced_passed_deferral,
-                                    filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+                                    filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
                                     funcname: "TwitterScraper.get_follower_ids"
                                   });
                                   setTimeout(__iced_deferrals.defer({
@@ -518,7 +518,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
             funcname: "TwitterScraper.check_status"
           });
           _this._get_url_body({
@@ -605,7 +605,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
             funcname: "TwitterScraper._get_bearer_token"
           });
           bt.get(__iced_deferrals.defer({
@@ -637,7 +637,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
             funcname: "TwitterScraper._get_body_api"
           });
           _this._get_bearer_token(__iced_deferrals.defer({
@@ -670,7 +670,7 @@
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/twitter.iced",
+                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/keybase-proofs/src/scrapers/twitter.iced",
                   funcname: "TwitterScraper._get_body_api"
                 });
                 _this._get_url_body(args, __iced_deferrals.defer({

package/lib/util.js

@@ -1,6 +1,6 @@
 // Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var Lock, bufeq_secure, constants, crypto, json_secure_compare, json_stringify_sorted, pack, v2_sig_type_from_sig_type, _ref;
+  var Lock, bufeq_secure, constants, crypto, get_own, has_own, json_secure_compare, json_stringify_sorted, pack, v2_sig_type_from_sig_type, _has_own, _ref;
 
   constants = require('./constants').constants;
 
@@ -10,6 +10,20 @@
 
   pack = require('purepack').pack;
 
+  _has_own = {}.constructor.prototype.hasOwnProperty;
+
+  exports.has_own = has_own = function(o, k) {
+    return _has_own.call(o, k);
+  };
+
+  exports.get_own = get_own = function(o, k) {
+    if (_has_own.call(o, k)) {
+      return o[k];
+    } else {
+      return void 0;
+    }
+  };
+
   exports.json_secure_compare = json_secure_compare = function(a, b) {
     var err, o1, o2, x, _ref1;
     _ref1 = (function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keybase-proofs",
-  "version": "2.3.33",
+  "version": "2.3.34",
   "description": "Publicly-verifiable proofs of identity",
   "main": "lib/main.js",
   "scripts": {

package/src/alloc.iced

@@ -15,9 +15,9 @@ base = require './base'
 {PGPUpdate} = require './pgp_update'
 {UpdatePassphraseHash} = require './update_passphrase_hash'
 {UpdateSettings} = require './update_settings'
+{get_own} = require './util'
 team = require './team'
 team_hidden = require './team_hidden'
-wot = require './wot'
 
 #=======================================================
 
@@ -65,15 +65,13 @@ lookup_tab = {
   "team.kbfs"                      : team.KBFS
   "team.settings"                  : team.Settings
   "team.bot_settings"              : team.BotSettings
-  "wot.vouch"                      : wot.Vouch
-  "wot.react"                      : wot.React
 }
 
 #--------------------------------------------
 
 get_klass = (type, extra_lookup_tab) ->
   err = klass = null
-  unless (klass = extra_lookup_tab?[type])? or (klass = lookup_tab[type])?
+  unless (extra_lookup_tab? and (klass = get_own(extra_lookup_tab, type))?) or (klass = get_own(lookup_tab, type))?
     err = new Error "Unknown proof class: #{type}"
   [err, klass]
 

package/src/constants.iced

@@ -44,6 +44,8 @@ exports.constants = constants =
       kbfs : "team.kbfs"
       settings : "team.settings"
       bot_settings : "team.bot_settings"
+    # wot proofs are deprecated, but constants must remain available to kbweb
+    # because of existing signatures.
     wot :
       vouch : "wot.vouch"
       react : "wot.react"
@@ -83,6 +85,8 @@ exports.constants = constants =
       bot_settings: 48
     wallet :
       stellar : 15
+    # wot proofs are deprecated, but constants must remain available to kbweb
+    # because of existing signatures.
     wot :
       vouch : 16
       vouch_with_revoke : 17

package/src/main.iced

@@ -32,7 +32,6 @@ mods = [
   require('./scrapers/hackernews')
   require('./scrapers/generic_social')
   require('./errors')
-  require('./wot')
 ]
 
 for m in mods
@@ -44,4 +43,3 @@ exports.team = require('./team')
 exports.team_hidden = require('./team_hidden')
 exports.sig3 = require('./sig3')
 exports.schema = require('./schema3')
-exports.wot = require('./wot')

package/src/parse3.iced

@@ -15,10 +15,16 @@ exports.is_kid = (h) -> is_hex(h,35)
 exports.is_int = is_int = (s) ->
     n = Math.floor Number s
     return typeof(s) is 'number' and (n isnt Infinity) and (n is s) and n >= 0
+exports.decode_hex = decode_hex = (s) ->
+  return null unless typeof(s) is 'string'
+  buf = Buffer.from s, 'hex'
+  return null unless buf.toString('hex') is s.toLowerCase()
+  buf
 exports.is_hex = is_hex = (h, l) ->
   return false unless h?
-  if typeof(h) is 'string' then h = Buffer.from(h, 'hex')
-  else if not Buffer.isBuffer then return false
+  if typeof(h) is 'string'
+    return false unless (h = decode_hex(h))?
+  else if not Buffer.isBuffer(h) then return false
   return (h.length is l)
 exports.is_seqno = (s) ->
   return false unless s?
@@ -75,6 +81,6 @@ exports.is_chain_type = (x) ->
 exports.unhex = (b) ->
   if not b? then null
   else if Buffer.isBuffer(b) then b
-  else if typeof(b) is 'string' then Buffer.from(b, 'hex')
+  else if typeof(b) is 'string' and (h = decode_hex(b))? then h
   else throw new Error "bad binary or hex string"