Merge pull request #2185 from reaperhulk/simplify-x509-decode

simplify x509 extension decoding