summaryrefslogtreecommitdiff
path: root/lib/auth_dhe.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-03-25 08:52:45 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-03-25 08:52:45 +0000
commit09fcc01a2da78bd37c9b0443cde6e606700a3584 (patch)
treeb1aaee8b246801f2d7cb5e03ccbb3de9a68811b7 /lib/auth_dhe.c
parentc13fd0d7062dd0146ee5ff3da08ad7fa62b3d23d (diff)
downloadgnutls-09fcc01a2da78bd37c9b0443cde6e606700a3584.tar.gz
Backported changes from the development cvs version.
Those are: - Added gnutls_certificate_set_params_function() and gnutls_anon_set_params_function() that set the RSA or DH parameters using a callback. - Added functions gnutls_rsa_params_cpy(), gnutls_dh_params_cpy() and gnutls_x509_privkey_cpy(). - Corrected a compilation issue when opencdk was installed in a non standard directory.
Diffstat (limited to 'lib/auth_dhe.c')
-rw-r--r--lib/auth_dhe.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index 79f499156f..bc7eede562 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -89,6 +89,7 @@ static int gen_dhe_server_kx(gnutls_session session, opaque ** data)
gnutls_datum signature, ddata;
CERTIFICATE_AUTH_INFO info;
const gnutls_certificate_credentials cred;
+ gnutls_dh_params dh_params;
cred = _gnutls_get_cred(session->key, GNUTLS_CRD_CERTIFICATE, NULL);
if (cred == NULL) {
@@ -107,7 +108,8 @@ static int gen_dhe_server_kx(gnutls_session session, opaque ** data)
return ret;
}
- mpis = _gnutls_get_dh_params( cred->dh_params);
+ dh_params = _gnutls_certificate_get_dh_params( cred, session);
+ mpis = _gnutls_get_dh_params( dh_params);
if (mpis == NULL) {
gnutls_assert();
return GNUTLS_E_NO_TEMPORARY_DH_PARAMS;
@@ -237,6 +239,7 @@ const gnutls_certificate_credentials cred;
int ret;
GNUTLS_MPI p, g;
const GNUTLS_MPI *mpis;
+gnutls_dh_params dh_params;
bits = _gnutls_dh_get_prime_bits( session);
@@ -246,7 +249,8 @@ const GNUTLS_MPI *mpis;
return GNUTLS_E_INSUFFICIENT_CREDENTIALS;
}
- mpis = _gnutls_get_dh_params( cred->dh_params);
+ dh_params = _gnutls_certificate_get_dh_params( cred, session);
+ mpis = _gnutls_get_dh_params( dh_params);
if (mpis == NULL) {
gnutls_assert();
return GNUTLS_E_NO_TEMPORARY_DH_PARAMS;