Sadly we only know whether its a OpenPGP or X509 signature during
parsing, so we need to switch the implementation mid-way

Change-Id: Ib48a9da0105de62cfecda095df8c154b59ba8c40