diff options
Diffstat (limited to 'src/daemon/https/tls/auth_rsa.c')
-rw-r--r-- | src/daemon/https/tls/auth_rsa.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/daemon/https/tls/auth_rsa.c b/src/daemon/https/tls/auth_rsa.c index 97f1901d..f39a91fb 100644 --- a/src/daemon/https/tls/auth_rsa.c +++ b/src/daemon/https/tls/auth_rsa.c | |||
@@ -57,7 +57,7 @@ const MHD_gtls_mod_auth_st MHD_gtls_rsa_auth_struct = { | |||
57 | MHD_gtls_proc_cert_server_certificate, | 57 | MHD_gtls_proc_cert_server_certificate, |
58 | MHD__gnutls_proc_cert_client_certificate, | 58 | MHD__gnutls_proc_cert_client_certificate, |
59 | NULL, /* proc server kx */ | 59 | NULL, /* proc server kx */ |
60 | MHD__gnutls_proc_rsa_client_kx, /* proc client kx */ | 60 | MHD__gnutls_proc_rsa_client_kx, /* proc client kx */ |
61 | MHD_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ | 61 | MHD_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ |
62 | MHD_gtls_proc_cert_cert_req /* proc server cert request */ | 62 | MHD_gtls_proc_cert_cert_req /* proc server cert request */ |
63 | }; | 63 | }; |
@@ -66,8 +66,8 @@ const MHD_gtls_mod_auth_st MHD_gtls_rsa_auth_struct = { | |||
66 | */ | 66 | */ |
67 | int | 67 | int |
68 | MHD__gnutls_get_public_rsa_params (MHD_gtls_session_t session, | 68 | MHD__gnutls_get_public_rsa_params (MHD_gtls_session_t session, |
69 | mpi_t params[MAX_PUBLIC_PARAMS_SIZE], | 69 | mpi_t params[MAX_PUBLIC_PARAMS_SIZE], |
70 | int *params_len) | 70 | int *params_len) |
71 | { | 71 | { |
72 | int ret; | 72 | int ret; |
73 | cert_auth_info_t info; | 73 | cert_auth_info_t info; |
@@ -148,7 +148,7 @@ MHD__gnutls_get_public_rsa_params (MHD_gtls_session_t session, | |||
148 | */ | 148 | */ |
149 | int | 149 | int |
150 | MHD__gnutls_get_private_rsa_params (MHD_gtls_session_t session, | 150 | MHD__gnutls_get_private_rsa_params (MHD_gtls_session_t session, |
151 | mpi_t ** params, int *params_size) | 151 | mpi_t ** params, int *params_size) |
152 | { | 152 | { |
153 | int bits; | 153 | int bits; |
154 | MHD_gtls_cert_credentials_t cred; | 154 | MHD_gtls_cert_credentials_t cred; |
@@ -169,8 +169,8 @@ MHD__gnutls_get_private_rsa_params (MHD_gtls_session_t session, | |||
169 | } | 169 | } |
170 | 170 | ||
171 | bits = | 171 | bits = |
172 | MHD__gnutls_mpi_get_nbits (session->internals.selected_cert_list[0]. | 172 | MHD__gnutls_mpi_get_nbits (session->internals. |
173 | params[0]); | 173 | selected_cert_list[0].params[0]); |
174 | 174 | ||
175 | if (MHD_gtls_cipher_suite_get_kx_algo | 175 | if (MHD_gtls_cipher_suite_get_kx_algo |
176 | (&session->security_parameters.current_cipher_suite) | 176 | (&session->security_parameters.current_cipher_suite) |
@@ -207,7 +207,7 @@ MHD__gnutls_get_private_rsa_params (MHD_gtls_session_t session, | |||
207 | 207 | ||
208 | int | 208 | int |
209 | MHD__gnutls_proc_rsa_client_kx (MHD_gtls_session_t session, opaque * data, | 209 | MHD__gnutls_proc_rsa_client_kx (MHD_gtls_session_t session, opaque * data, |
210 | size_t _data_size) | 210 | size_t _data_size) |
211 | { | 211 | { |
212 | MHD_gnutls_datum_t plaintext; | 212 | MHD_gnutls_datum_t plaintext; |
213 | MHD_gnutls_datum_t ciphertext; | 213 | MHD_gnutls_datum_t ciphertext; |
@@ -291,7 +291,8 @@ MHD__gnutls_proc_rsa_client_kx (MHD_gtls_session_t session, opaque * data, | |||
291 | 291 | ||
292 | /* we do not need strong random numbers here. | 292 | /* we do not need strong random numbers here. |
293 | */ | 293 | */ |
294 | if (MHD_gc_nonce ((char*) session->key->key.data, session->key->key.size) != GC_OK) | 294 | if (MHD_gc_nonce |
295 | ((char *) session->key->key.data, session->key->key.size) != GC_OK) | ||
295 | { | 296 | { |
296 | MHD_gnutls_assert (); | 297 | MHD_gnutls_assert (); |
297 | return GNUTLS_E_RANDOM_FAILED; | 298 | return GNUTLS_E_RANDOM_FAILED; |
@@ -321,7 +322,7 @@ int | |||
321 | MHD__gnutls_gen_rsa_client_kx (MHD_gtls_session_t session, opaque ** data) | 322 | MHD__gnutls_gen_rsa_client_kx (MHD_gtls_session_t session, opaque ** data) |
322 | { | 323 | { |
323 | cert_auth_info_t auth; | 324 | cert_auth_info_t auth; |
324 | MHD_gnutls_datum_t sdata; /* data to send */ | 325 | MHD_gnutls_datum_t sdata; /* data to send */ |
325 | mpi_t params[MAX_PUBLIC_PARAMS_SIZE]; | 326 | mpi_t params[MAX_PUBLIC_PARAMS_SIZE]; |
326 | int params_len = MAX_PUBLIC_PARAMS_SIZE; | 327 | int params_len = MAX_PUBLIC_PARAMS_SIZE; |
327 | int ret, i; | 328 | int ret, i; |
@@ -330,7 +331,7 @@ MHD__gnutls_gen_rsa_client_kx (MHD_gtls_session_t session, opaque ** data) | |||
330 | if (session->key == NULL) | 331 | if (session->key == NULL) |
331 | { | 332 | { |
332 | MHD_gnutls_assert (); | 333 | MHD_gnutls_assert (); |
333 | return GNUTLS_E_INSUFFICIENT_CREDENTIALS; | 334 | return GNUTLS_E_INSUFFICIENT_CREDENTIALS; |
334 | } | 335 | } |
335 | 336 | ||
336 | auth = session->key->auth_info; | 337 | auth = session->key->auth_info; |
@@ -352,8 +353,8 @@ MHD__gnutls_gen_rsa_client_kx (MHD_gtls_session_t session, opaque ** data) | |||
352 | return GNUTLS_E_MEMORY_ERROR; | 353 | return GNUTLS_E_MEMORY_ERROR; |
353 | } | 354 | } |
354 | 355 | ||
355 | if (MHD_gc_pseudo_random ((char*) session->key->key.data, | 356 | if (MHD_gc_pseudo_random ((char *) session->key->key.data, |
356 | session->key->key.size) != GC_OK) | 357 | session->key->key.size) != GC_OK) |
357 | { | 358 | { |
358 | MHD_gnutls_assert (); | 359 | MHD_gnutls_assert (); |
359 | return GNUTLS_E_RANDOM_FAILED; | 360 | return GNUTLS_E_RANDOM_FAILED; |