diff options
Diffstat (limited to 'src/daemon/https/tls/auth_dhe.c')
-rw-r--r-- | src/daemon/https/tls/auth_dhe.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/daemon/https/tls/auth_dhe.c b/src/daemon/https/tls/auth_dhe.c index 9cfdbb99..43aedf0b 100644 --- a/src/daemon/https/tls/auth_dhe.c +++ b/src/daemon/https/tls/auth_dhe.c | |||
@@ -49,15 +49,15 @@ const mhd_gtls_mod_auth_st mhd_gtls_dhe_rsa_auth_struct = { | |||
49 | mhd_gtls_gen_cert_client_certificate, | 49 | mhd_gtls_gen_cert_client_certificate, |
50 | gen_dhe_server_kx, | 50 | gen_dhe_server_kx, |
51 | mhd_gtls_gen_dh_common_client_kx, | 51 | mhd_gtls_gen_dh_common_client_kx, |
52 | mhd_gtls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */ | 52 | mhd_gtls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */ |
53 | mhd_gtls_gen_cert_server_cert_req, /* server cert request */ | 53 | mhd_gtls_gen_cert_server_cert_req, /* server cert request */ |
54 | 54 | ||
55 | mhd_gtls_proc_cert_server_certificate, | 55 | mhd_gtls_proc_cert_server_certificate, |
56 | _gnutls_proc_cert_client_certificate, | 56 | _gnutls_proc_cert_client_certificate, |
57 | proc_dhe_server_kx, | 57 | proc_dhe_server_kx, |
58 | proc_dhe_client_kx, | 58 | proc_dhe_client_kx, |
59 | mhd_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ | 59 | mhd_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ |
60 | mhd_gtls_proc_cert_cert_req /* proc server cert request */ | 60 | mhd_gtls_proc_cert_cert_req /* proc server cert request */ |
61 | }; | 61 | }; |
62 | 62 | ||
63 | const mhd_gtls_mod_auth_st mhd_gtls_dhe_dss_auth_struct = { | 63 | const mhd_gtls_mod_auth_st mhd_gtls_dhe_dss_auth_struct = { |
@@ -66,15 +66,15 @@ const mhd_gtls_mod_auth_st mhd_gtls_dhe_dss_auth_struct = { | |||
66 | mhd_gtls_gen_cert_client_certificate, | 66 | mhd_gtls_gen_cert_client_certificate, |
67 | gen_dhe_server_kx, | 67 | gen_dhe_server_kx, |
68 | mhd_gtls_gen_dh_common_client_kx, | 68 | mhd_gtls_gen_dh_common_client_kx, |
69 | mhd_gtls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */ | 69 | mhd_gtls_gen_cert_client_cert_vrfy, /* gen client cert vrfy */ |
70 | mhd_gtls_gen_cert_server_cert_req, /* server cert request */ | 70 | mhd_gtls_gen_cert_server_cert_req, /* server cert request */ |
71 | 71 | ||
72 | mhd_gtls_proc_cert_server_certificate, | 72 | mhd_gtls_proc_cert_server_certificate, |
73 | _gnutls_proc_cert_client_certificate, | 73 | _gnutls_proc_cert_client_certificate, |
74 | proc_dhe_server_kx, | 74 | proc_dhe_server_kx, |
75 | proc_dhe_client_kx, | 75 | proc_dhe_client_kx, |
76 | mhd_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ | 76 | mhd_gtls_proc_cert_client_cert_vrfy, /* proc client cert vrfy */ |
77 | mhd_gtls_proc_cert_cert_req /* proc server cert request */ | 77 | mhd_gtls_proc_cert_cert_req /* proc server cert request */ |
78 | }; | 78 | }; |
79 | 79 | ||
80 | 80 | ||
@@ -105,7 +105,7 @@ gen_dhe_server_kx (mhd_gtls_session_t session, opaque ** data) | |||
105 | /* find the appropriate certificate */ | 105 | /* find the appropriate certificate */ |
106 | if ((ret = | 106 | if ((ret = |
107 | mhd_gtls_get_selected_cert (session, &apr_cert_list, | 107 | mhd_gtls_get_selected_cert (session, &apr_cert_list, |
108 | &apr_cert_list_length, &apr_pkey)) < 0) | 108 | &apr_cert_list_length, &apr_pkey)) < 0) |
109 | { | 109 | { |
110 | gnutls_assert (); | 110 | gnutls_assert (); |
111 | return ret; | 111 | return ret; |
@@ -124,7 +124,7 @@ gen_dhe_server_kx (mhd_gtls_session_t session, opaque ** data) | |||
124 | g = mpis[1]; | 124 | g = mpis[1]; |
125 | 125 | ||
126 | if ((ret = mhd_gtls_auth_info_set (session, MHD_GNUTLS_CRD_CERTIFICATE, | 126 | if ((ret = mhd_gtls_auth_info_set (session, MHD_GNUTLS_CRD_CERTIFICATE, |
127 | sizeof (cert_auth_info_st), 0)) < 0) | 127 | sizeof (cert_auth_info_st), 0)) < 0) |
128 | { | 128 | { |
129 | gnutls_assert (); | 129 | gnutls_assert (); |
130 | return ret; | 130 | return ret; |
@@ -149,7 +149,7 @@ gen_dhe_server_kx (mhd_gtls_session_t session, opaque ** data) | |||
149 | { | 149 | { |
150 | if ((ret = | 150 | if ((ret = |
151 | mhd_gtls_tls_sign_params (session, &apr_cert_list[0], | 151 | mhd_gtls_tls_sign_params (session, &apr_cert_list[0], |
152 | apr_pkey, &ddata, &signature)) < 0) | 152 | apr_pkey, &ddata, &signature)) < 0) |
153 | { | 153 | { |
154 | gnutls_assert (); | 154 | gnutls_assert (); |
155 | gnutls_free (*data); | 155 | gnutls_free (*data); |
@@ -217,15 +217,16 @@ proc_dhe_server_kx (mhd_gtls_session_t session, opaque * data, | |||
217 | 217 | ||
218 | if ((ret = | 218 | if ((ret = |
219 | mhd_gtls_raw_cert_to_gcert (&peer_cert, | 219 | mhd_gtls_raw_cert_to_gcert (&peer_cert, |
220 | session->security_parameters.cert_type, | 220 | session->security_parameters.cert_type, |
221 | &info->raw_certificate_list[0], | 221 | &info->raw_certificate_list[0], |
222 | CERT_NO_COPY)) < 0) | 222 | CERT_NO_COPY)) < 0) |
223 | { | 223 | { |
224 | gnutls_assert (); | 224 | gnutls_assert (); |
225 | return ret; | 225 | return ret; |
226 | } | 226 | } |
227 | 227 | ||
228 | ret = mhd_gtls_verify_sig_params (session, &peer_cert, &vparams, &signature); | 228 | ret = |
229 | mhd_gtls_verify_sig_params (session, &peer_cert, &vparams, &signature); | ||
229 | 230 | ||
230 | mhd_gtls_gcert_deinit (&peer_cert); | 231 | mhd_gtls_gcert_deinit (&peer_cert); |
231 | if (ret < 0) | 232 | if (ret < 0) |