diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2000-11-01 23:13:06 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2000-11-01 23:13:06 +0000 |
| commit | 7a44b3ef158797335f7fc06596bcaeb73897c001 (patch) | |
| tree | 1fdf0c8586f771c275432d79822f742eda7e4b02 /lib/gnutls_kx.c | |
| parent | 14e332cb78ed960c0fe0e71fb343e96cb52b9f8d (diff) | |
| download | gnutls-7a44b3ef158797335f7fc06596bcaeb73897c001.tar.gz | |
cvs should stop messing with MY files
Diffstat (limited to 'lib/gnutls_kx.c')
| -rw-r--r-- | lib/gnutls_kx.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c index 7698747d61..247efa250d 100644 --- a/lib/gnutls_kx.c +++ b/lib/gnutls_kx.c @@ -208,8 +208,6 @@ int _gnutls_send_client_kx_message(int cd, GNUTLS_STATE state) return ret; } - -<<<<<<< gnutls_kx.c /* This is the function for the client to send the certificate * verify message * FIXME: this function does almost nothing except sending shit to @@ -248,44 +246,6 @@ int _gnutls_send_client_certificate_verify(int cd, GNUTLS_STATE state) } -======= -/* This is the function for the client to send the certificate - * verify message - */ -int _gnutls_send_client_certificate_verify(int cd, GNUTLS_STATE state) -{ - uint8 *data; - int ret = 0; -#ifdef HARD_DEBUG - fprintf(stderr, "Sending client certificate verify message\n"); -#endif - switch (_gnutls_cipher_suite_get_kx_algo - (state->gnutls_internals.current_cipher_suite)) { - case GNUTLS_KX_DHE_DSS: - data=gnutls_malloc(20); - ret = - _gnutls_send_handshake(cd, state, data, - 20, - GNUTLS_CERTIFICATE_VERIFY); - gnutls_free(data); - break; - case GNUTLS_KX_DHE_RSA: - data=gnutls_malloc(20+16); - ret = - _gnutls_send_handshake(cd, state, data, - 20+16, - GNUTLS_CERTIFICATE_VERIFY); - gnutls_free(data); - break; - default: - ret = 0; - } - - return ret; -} - - ->>>>>>> 1.16 int _gnutls_recv_server_kx_message(int cd, GNUTLS_STATE state) { KXAlgorithm algorithm; @@ -435,11 +395,7 @@ int _gnutls_recv_client_kx_message(int cd, GNUTLS_STATE state) #endif _n_Y = n_Y; gcry_mpi_scan(&state->gnutls_internals.client_Y, -<<<<<<< gnutls_kx.c GCRYMPI_FMT_USG, &data[2], &_n_Y); -======= - GCRYMPI_FMT_USG, &data[3], &_n_Y); ->>>>>>> 1.16 state->gnutls_internals.KEY = gnutls_calc_dh_key(state-> gnutls_internals.client_Y, |