How To Mitigate The Efail Flaws In OpenPGP And S