Changes motivated by recently proposed extensions to OpenPGP.

Enables OpenPGP to be used in compliance with SCA regulations within China.