Adding support back to specify cert and key to sign

* Opening the p12 and extracting the key seemed to invalidate
  it. So allowing either to be used with p12 taking precedence.