Merged support for RSA/DH/ECDH key agreement

By: manuel.mausz.at
Submitted by: Carlos Lopez (Suso) <lopez@galicia.com>