diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-12-16 11:49:40 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-12-16 11:49:40 +0000 |
| commit | b929e5b3cde43482d4f502260c06cf1270079755 (patch) | |
| tree | f1e7884e55bd5c83ab53038fe67eecc9770b3ef2 /lib/auth_rsa.c | |
| parent | 36b34cea246de4ffa74d2ec55040747ead89ea2c (diff) | |
| download | gnutls-b929e5b3cde43482d4f502260c06cf1270079755.tar.gz | |
* The error codes GNUTLS_E_NO_TEMPORARY_DH_PARAMS and GNUTLS_E_NO_TEMPORARY_RSA_PARAMS
are no longer returned by the handshake function. Ciphersuites that
require temporary parameters are removed when such parameters do not exist.
* Several internal changes to allow adding the callback function to retrieve
the certificate and the private key.
Diffstat (limited to 'lib/auth_rsa.c')
| -rw-r--r-- | lib/auth_rsa.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/auth_rsa.c b/lib/auth_rsa.c index ef8d0d6d5e..8dd219716e 100644 --- a/lib/auth_rsa.c +++ b/lib/auth_rsa.c @@ -156,7 +156,7 @@ int i; */ int _gnutls_get_private_rsa_params(gnutls_session session, GNUTLS_MPI **params, int* params_size) { -int index; +int bits; const gnutls_certificate_credentials cred; cred = _gnutls_get_cred(session->key, GNUTLS_CRD_CERTIFICATE, NULL); @@ -165,14 +165,16 @@ const gnutls_certificate_credentials cred; return GNUTLS_E_INSUFFICIENT_CREDENTIALS; } - if ( (index=session->internals.selected_cert_index) < 0) { + if (session->internals.selected_cert_list == NULL) { gnutls_assert(); - return GNUTLS_E_INTERNAL_ERROR; + return GNUTLS_E_INSUFFICIENT_CREDENTIALS; } + bits = _gnutls_mpi_get_nbits(session->internals.selected_cert_list[0].params[0]); + if ( _gnutls_cipher_suite_get_kx_algo(session->security_parameters.current_cipher_suite) == GNUTLS_KX_RSA_EXPORT && - _gnutls_mpi_get_nbits(cred->cert_list[index][0].params[0]) > 512) { + bits > 512) { /* EXPORT case: */ if (cred->rsa_params == NULL) { @@ -192,8 +194,8 @@ const gnutls_certificate_credentials cred; /* non export cipher suites. */ - *params_size = cred->pkey[index].params_size; - *params = cred->pkey[index].params; + *params_size = session->internals.selected_key->params_size; + *params = session->internals.selected_key->params; return 0; } |