Preparation for GnuTLS support