X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=blobdiff_plain;f=src%2Fssli_gnutls.c;h=ac5eb90eca12c404fee3e3b2967fa0b56e80c70a;hp=3cbb17b3cbbfcd4215bba230106946a81f7fc3df;hb=69dc97bc69bf964ed26f66a6d08a2efb7fece3f0;hpb=fb466b8e2ac6b4b0c2668a6c16e3d90640e161fa

diff --git a/src/ssli_gnutls.c b/src/ssli_gnutls.c
index 3cbb17b..ac5eb90 100644
--- a/src/ssli_gnutls.c
+++ b/src/ssli_gnutls.c
@@ -68,16 +68,21 @@ void SSLi_init()
 {
 	unsigned const bitCount = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_MEDIUM);
 
+	gnutls_priority_init(&cipherCache, ciphers, NULL);
+	initializeCertificate();
+
 	gnutls_dh_params_init(&dhParameters);
-	gnutls_dh_params_generate2(dhParameters, bitCount);
 
-#if GNUTLS_VERSION_NUMBER < 0x030300
-	gnutls_global_init();
-#endif
+	Log_info("Generating Diffie-Hellman parameters (%i bits)", bitCount);
+	int error = gnutls_dh_params_generate2(dhParameters, bitCount);
 
-	gnutls_priority_init(&cipherCache, ciphers, NULL);
+	if(!error) {
+		Log_info("Successfully generated Diffie-Hellman parameters");
+	} else {
+		Log_warn("Failed to generate Diffie-Hellman parameters: %s", gnutls_strerror(error));
+	}
 
-	initializeCertificate();
+	gnutls_certificate_set_dh_params(certificate, dhParameters);
 
 	Log_info("Sucessfully initialized GNUTLS version %s", gnutls_check_version(NULL));