Merge pull request #3 from jschanck-si/master

Unify message weight checking for all key types