aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_cert.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_cert.c')
-rw-r--r--src/daemon/https/tls/gnutls_cert.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/daemon/https/tls/gnutls_cert.c b/src/daemon/https/tls/gnutls_cert.c
index 45e001d6..d01d3918 100644
--- a/src/daemon/https/tls/gnutls_cert.c
+++ b/src/daemon/https/tls/gnutls_cert.c
@@ -210,7 +210,7 @@ MHD__gnutls_certificate_free_credentials (MHD_gtls_cert_credentials_t sc)
210 **/ 210 **/
211int 211int
212MHD__gnutls_certificate_allocate_credentials (MHD_gtls_cert_credentials_t * 212MHD__gnutls_certificate_allocate_credentials (MHD_gtls_cert_credentials_t *
213 res) 213 res)
214{ 214{
215 *res = MHD_gnutls_calloc (1, sizeof (MHD_gtls_cert_credentials_st)); 215 *res = MHD_gnutls_calloc (1, sizeof (MHD_gtls_cert_credentials_st));
216 216
@@ -271,7 +271,8 @@ MHD_gtls_selected_cert_supported_kx (MHD_gtls_session_t session,
271 return GNUTLS_E_INVALID_REQUEST; 271 return GNUTLS_E_INVALID_REQUEST;
272 } 272 }
273 273
274 *alg = MHD_gnutls_calloc (1, sizeof (enum MHD_GNUTLS_KeyExchangeAlgorithm) * i); 274 *alg =
275 MHD_gnutls_calloc (1, sizeof (enum MHD_GNUTLS_KeyExchangeAlgorithm) * i);
275 if (*alg == NULL) 276 if (*alg == NULL)
276 return GNUTLS_E_MEMORY_ERROR; 277 return GNUTLS_E_MEMORY_ERROR;
277 278
@@ -550,8 +551,9 @@ MHD_gtls_certificate_expiration_time_peers (MHD_gtls_session_t session)
550 { 551 {
551 case MHD_GNUTLS_CRT_X509: 552 case MHD_GNUTLS_CRT_X509:
552 return 553 return
553 MHD__gnutls_x509_get_raw_crt_expiration_time (&info->raw_certificate_list 554 MHD__gnutls_x509_get_raw_crt_expiration_time (&info->
554 [0]); 555 raw_certificate_list
556 [0]);
555 default: 557 default:
556 return (time_t) - 1; 558 return (time_t) - 1;
557 } 559 }
@@ -589,8 +591,9 @@ MHD_gtls_certificate_activation_time_peers (MHD_gtls_session_t session)
589 { 591 {
590 case MHD_GNUTLS_CRT_X509: 592 case MHD_GNUTLS_CRT_X509:
591 return 593 return
592 MHD__gnutls_x509_get_raw_crt_activation_time (&info->raw_certificate_list 594 MHD__gnutls_x509_get_raw_crt_activation_time (&info->
593 [0]); 595 raw_certificate_list
596 [0]);
594 default: 597 default:
595 return (time_t) - 1; 598 return (time_t) - 1;
596 } 599 }
@@ -695,7 +698,8 @@ MHD_gtls_x509_crt_to_gcert (MHD_gnutls_cert * gcert,
695 } 698 }
696 699
697 ret = 700 ret =
698 MHD_gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_DER, der, &der_size); 701 MHD_gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_DER, der,
702 &der_size);
699 if (ret < 0 && ret != GNUTLS_E_SHORT_MEMORY_BUFFER) 703 if (ret < 0 && ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
700 { 704 {
701 MHD_gnutls_assert (); 705 MHD_gnutls_assert ();
@@ -714,7 +718,7 @@ MHD_gtls_x509_crt_to_gcert (MHD_gnutls_cert * gcert,
714 718
715 ret = 719 ret =
716 MHD_gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_DER, der, 720 MHD_gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_DER, der,
717 &der_size); 721 &der_size);
718 if (ret < 0) 722 if (ret < 0)
719 { 723 {
720 MHD_gnutls_assert (); 724 MHD_gnutls_assert ();
@@ -736,13 +740,15 @@ MHD_gtls_x509_crt_to_gcert (MHD_gnutls_cert * gcert,
736 MHD_gnutls_x509_crt_get_key_usage (cert, &gcert->key_usage, NULL); 740 MHD_gnutls_x509_crt_get_key_usage (cert, &gcert->key_usage, NULL);
737 gcert->version = MHD_gnutls_x509_crt_get_version (cert); 741 gcert->version = MHD_gnutls_x509_crt_get_version (cert);
738 } 742 }
739 gcert->subject_pk_algorithm = MHD_gnutls_x509_crt_get_pk_algorithm (cert, NULL); 743 gcert->subject_pk_algorithm =
744 MHD_gnutls_x509_crt_get_pk_algorithm (cert, NULL);
740 745
741 if (flags & CERT_ONLY_PUBKEY || flags == 0) 746 if (flags & CERT_ONLY_PUBKEY || flags == 0)
742 { 747 {
743 gcert->params_size = MAX_PUBLIC_PARAMS_SIZE; 748 gcert->params_size = MAX_PUBLIC_PARAMS_SIZE;
744 ret = 749 ret =
745 MHD__gnutls_x509_crt_get_mpis (cert, gcert->params, &gcert->params_size); 750 MHD__gnutls_x509_crt_get_mpis (cert, gcert->params,
751 &gcert->params_size);
746 if (ret < 0) 752 if (ret < 0)
747 { 753 {
748 MHD_gnutls_assert (); 754 MHD_gnutls_assert ();