diff options
Diffstat (limited to 'src/daemon/https/tls/ext_oprfi.c')
-rw-r--r-- | src/daemon/https/tls/ext_oprfi.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/daemon/https/tls/ext_oprfi.c b/src/daemon/https/tls/ext_oprfi.c index 913820da..8b245404 100644 --- a/src/daemon/https/tls/ext_oprfi.c +++ b/src/daemon/https/tls/ext_oprfi.c | |||
@@ -58,7 +58,8 @@ oprfi_recv_server (MHD_gtls_session_t session, | |||
58 | 58 | ||
59 | /* Store incoming data. */ | 59 | /* Store incoming data. */ |
60 | session->security_parameters.extensions.oprfi_client_len = len; | 60 | session->security_parameters.extensions.oprfi_client_len = len; |
61 | session->security_parameters.extensions.oprfi_client = MHD_gnutls_malloc (len); | 61 | session->security_parameters.extensions.oprfi_client = |
62 | MHD_gnutls_malloc (len); | ||
62 | if (!session->security_parameters.extensions.oprfi_client) | 63 | if (!session->security_parameters.extensions.oprfi_client) |
63 | { | 64 | { |
64 | MHD_gnutls_assert (); | 65 | MHD_gnutls_assert (); |
@@ -101,7 +102,8 @@ oprfi_recv_client (MHD_gtls_session_t session, | |||
101 | 102 | ||
102 | /* Store incoming data. */ | 103 | /* Store incoming data. */ |
103 | session->security_parameters.extensions.oprfi_server_len = len; | 104 | session->security_parameters.extensions.oprfi_server_len = len; |
104 | session->security_parameters.extensions.oprfi_server = MHD_gnutls_malloc (len); | 105 | session->security_parameters.extensions.oprfi_server = |
106 | MHD_gnutls_malloc (len); | ||
105 | if (!session->security_parameters.extensions.oprfi_server) | 107 | if (!session->security_parameters.extensions.oprfi_server) |
106 | { | 108 | { |
107 | MHD_gnutls_assert (); | 109 | MHD_gnutls_assert (); |
@@ -165,7 +167,8 @@ oprfi_send_server (MHD_gtls_session_t session, opaque * data, | |||
165 | session->security_parameters.extensions.oprfi_server_len = | 167 | session->security_parameters.extensions.oprfi_server_len = |
166 | session->security_parameters.extensions.oprfi_client_len; | 168 | session->security_parameters.extensions.oprfi_client_len; |
167 | session->security_parameters.extensions.oprfi_server = | 169 | session->security_parameters.extensions.oprfi_server = |
168 | MHD_gnutls_malloc (session->security_parameters.extensions.oprfi_server_len); | 170 | MHD_gnutls_malloc (session->security_parameters.extensions. |
171 | oprfi_server_len); | ||
169 | if (!session->security_parameters.extensions.oprfi_server) | 172 | if (!session->security_parameters.extensions.oprfi_server) |
170 | { | 173 | { |
171 | MHD_gnutls_assert (); | 174 | MHD_gnutls_assert (); |
@@ -186,8 +189,8 @@ oprfi_send_server (MHD_gtls_session_t session, opaque * data, | |||
186 | } | 189 | } |
187 | 190 | ||
188 | DECR_LENGTH_RET (data_size, 2, GNUTLS_E_SHORT_MEMORY_BUFFER); | 191 | DECR_LENGTH_RET (data_size, 2, GNUTLS_E_SHORT_MEMORY_BUFFER); |
189 | MHD_gtls_write_uint16 (session->security_parameters. | 192 | MHD_gtls_write_uint16 (session->security_parameters.extensions. |
190 | extensions.oprfi_server_len, p); | 193 | oprfi_server_len, p); |
191 | p += 2; | 194 | p += 2; |
192 | 195 | ||
193 | DECR_LENGTH_RET (data_size, | 196 | DECR_LENGTH_RET (data_size, |
@@ -206,10 +209,10 @@ MHD_gtls_oprfi_send_params (MHD_gtls_session_t session, | |||
206 | { | 209 | { |
207 | #if MHD_DEBUG_TLS | 210 | #if MHD_DEBUG_TLS |
208 | if (session->security_parameters.entity == GNUTLS_CLIENT) | 211 | if (session->security_parameters.entity == GNUTLS_CLIENT) |
209 | return oprfi_send_client (session, data, data_size); | 212 | return oprfi_send_client (session, data, data_size); |
210 | else | 213 | else |
211 | #endif | 214 | #endif |
212 | return oprfi_send_server (session, data, data_size); | 215 | return oprfi_send_server (session, data, data_size); |
213 | } | 216 | } |
214 | 217 | ||
215 | /** | 218 | /** |
@@ -255,7 +258,8 @@ MHD_gtls_oprfi_enable_client (MHD_gtls_session_t session, | |||
255 | **/ | 258 | **/ |
256 | void | 259 | void |
257 | MHD_gtls_oprfi_enable_server (MHD_gtls_session_t session, | 260 | MHD_gtls_oprfi_enable_server (MHD_gtls_session_t session, |
258 | MHD_gnutls_oprfi_callback_func cb, void *userdata) | 261 | MHD_gnutls_oprfi_callback_func cb, |
262 | void *userdata) | ||
259 | { | 263 | { |
260 | session->security_parameters.extensions.oprfi_cb = cb; | 264 | session->security_parameters.extensions.oprfi_cb = cb; |
261 | session->security_parameters.extensions.oprfi_userdata = userdata; | 265 | session->security_parameters.extensions.oprfi_userdata = userdata; |