Backport forward secrecy support