diff options
Diffstat (limited to 'src/daemon/https/tls/gnutls_sig.c')
-rw-r--r-- | src/daemon/https/tls/gnutls_sig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/daemon/https/tls/gnutls_sig.c b/src/daemon/https/tls/gnutls_sig.c index 07ceb21b..3a41999d 100644 --- a/src/daemon/https/tls/gnutls_sig.c +++ b/src/daemon/https/tls/gnutls_sig.c | |||
@@ -65,7 +65,7 @@ mhd_gtls_tls_sign_hdata (mhd_gtls_session_t session, | |||
65 | return GNUTLS_E_HASH_FAILED; | 65 | return GNUTLS_E_HASH_FAILED; |
66 | } | 66 | } |
67 | 67 | ||
68 | if (ver == MHD_GNUTLS_SSL3) | 68 | if (ver == MHD_GNUTLS_PROTOCOL_SSL3) |
69 | { | 69 | { |
70 | ret = mhd_gtls_generate_master (session, 1); | 70 | ret = mhd_gtls_generate_master (session, 1); |
71 | if (ret < 0) | 71 | if (ret < 0) |
@@ -92,7 +92,7 @@ mhd_gtls_tls_sign_hdata (mhd_gtls_session_t session, | |||
92 | return GNUTLS_E_HASH_FAILED; | 92 | return GNUTLS_E_HASH_FAILED; |
93 | } | 93 | } |
94 | 94 | ||
95 | if (ver == MHD_GNUTLS_SSL3) | 95 | if (ver == MHD_GNUTLS_PROTOCOL_SSL3) |
96 | mhd_gnutls_mac_deinit_ssl3_handshake (td_md5, concat, | 96 | mhd_gnutls_mac_deinit_ssl3_handshake (td_md5, concat, |
97 | session->security_parameters. | 97 | session->security_parameters. |
98 | master_secret, TLS_MASTER_SIZE); | 98 | master_secret, TLS_MASTER_SIZE); |
@@ -146,7 +146,7 @@ mhd_gtls_tls_sign_params (mhd_gtls_session_t session, | |||
146 | switch (cert->subject_pk_algorithm) | 146 | switch (cert->subject_pk_algorithm) |
147 | { | 147 | { |
148 | case MHD_GNUTLS_PK_RSA: | 148 | case MHD_GNUTLS_PK_RSA: |
149 | if (ver < MHD_GNUTLS_TLS1_2) | 149 | if (ver < MHD_GNUTLS_PROTOCOL_TLS1_2) |
150 | { | 150 | { |
151 | mac_hd_t td_md5 = mhd_gtls_hash_init (MHD_GNUTLS_MAC_MD5); | 151 | mac_hd_t td_md5 = mhd_gtls_hash_init (MHD_GNUTLS_MAC_MD5); |
152 | if (td_md5 == NULL) | 152 | if (td_md5 == NULL) |
@@ -352,7 +352,7 @@ mhd_gtls_verify_sig_hdata (mhd_gtls_session_t session, | |||
352 | return GNUTLS_E_HASH_FAILED; | 352 | return GNUTLS_E_HASH_FAILED; |
353 | } | 353 | } |
354 | 354 | ||
355 | if (ver == MHD_GNUTLS_SSL3) | 355 | if (ver == MHD_GNUTLS_PROTOCOL_SSL3) |
356 | { | 356 | { |
357 | ret = mhd_gtls_generate_master (session, 1); | 357 | ret = mhd_gtls_generate_master (session, 1); |
358 | if (ret < 0) | 358 | if (ret < 0) |
@@ -404,7 +404,7 @@ mhd_gtls_verify_sig_params (mhd_gtls_session_t session, | |||
404 | opaque concat[36]; | 404 | opaque concat[36]; |
405 | enum MHD_GNUTLS_Protocol ver = MHD_gnutls_protocol_get_version (session); | 405 | enum MHD_GNUTLS_Protocol ver = MHD_gnutls_protocol_get_version (session); |
406 | 406 | ||
407 | if (ver < MHD_GNUTLS_TLS1_2) | 407 | if (ver < MHD_GNUTLS_PROTOCOL_TLS1_2) |
408 | { | 408 | { |
409 | td_md5 = mhd_gtls_hash_init (MHD_GNUTLS_MAC_MD5); | 409 | td_md5 = mhd_gtls_hash_init (MHD_GNUTLS_MAC_MD5); |
410 | if (td_md5 == NULL) | 410 | if (td_md5 == NULL) |
@@ -435,7 +435,7 @@ mhd_gtls_verify_sig_params (mhd_gtls_session_t session, | |||
435 | TLS_RANDOM_SIZE); | 435 | TLS_RANDOM_SIZE); |
436 | mhd_gnutls_hash (td_sha, params->data, params->size); | 436 | mhd_gnutls_hash (td_sha, params->data, params->size); |
437 | 437 | ||
438 | if (ver < MHD_GNUTLS_TLS1_2) | 438 | if (ver < MHD_GNUTLS_PROTOCOL_TLS1_2) |
439 | { | 439 | { |
440 | mhd_gnutls_hash_deinit (td_md5, concat); | 440 | mhd_gnutls_hash_deinit (td_md5, concat); |
441 | mhd_gnutls_hash_deinit (td_sha, &concat[16]); | 441 | mhd_gnutls_hash_deinit (td_sha, &concat[16]); |