aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_x509.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_x509.c')
-rw-r--r--src/daemon/https/tls/gnutls_x509.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/daemon/https/tls/gnutls_x509.c b/src/daemon/https/tls/gnutls_x509.c
index 183f12ba..503bea9b 100644
--- a/src/daemon/https/tls/gnutls_x509.c
+++ b/src/daemon/https/tls/gnutls_x509.c
@@ -46,7 +46,6 @@
46#include <sys/stat.h> 46#include <sys/stat.h>
47#include <fcntl.h> 47#include <fcntl.h>
48 48
49
50/* x509 */ 49/* x509 */
51#include "common.h" 50#include "common.h"
52#include "x509.h" 51#include "x509.h"
@@ -337,10 +336,10 @@ parse_pem_cert_mem (MHD_gnutls_cert ** cert_list, unsigned *ncerts,
337 336
338 /* move to the certificate 337 /* move to the certificate
339 */ 338 */
340 ptr = MHD_memmem (input_cert, input_cert_size, 339 ptr = memmem (input_cert, input_cert_size,
341 PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1); 340 PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
342 if (ptr == NULL) 341 if (ptr == NULL)
343 ptr = MHD_memmem (input_cert, input_cert_size, 342 ptr = memmem (input_cert, input_cert_size,
344 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1); 343 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
345 344
346 if (ptr == NULL) 345 if (ptr == NULL)
@@ -396,9 +395,9 @@ parse_pem_cert_mem (MHD_gnutls_cert ** cert_list, unsigned *ncerts,
396 { 395 {
397 char *ptr3; 396 char *ptr3;
398 397
399 ptr3 = MHD_memmem (ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1); 398 ptr3 = memmem (ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
400 if (ptr3 == NULL) 399 if (ptr3 == NULL)
401 ptr3 = MHD_memmem (ptr, size, PEM_CERT_SEP2, 400 ptr3 = memmem (ptr, size, PEM_CERT_SEP2,
402 sizeof (PEM_CERT_SEP2) - 1); 401 sizeof (PEM_CERT_SEP2) - 1);
403 402
404 ptr = ptr3; 403 ptr = ptr3;
@@ -794,10 +793,10 @@ parse_pem_ca_mem (MHD_gnutls_x509_crt_t ** cert_list, unsigned *ncerts,
794 793
795 /* move to the certificate 794 /* move to the certificate
796 */ 795 */
797 ptr = MHD_memmem (input_cert, input_cert_size, 796 ptr = memmem (input_cert, input_cert_size,
798 PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1); 797 PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
799 if (ptr == NULL) 798 if (ptr == NULL)
800 ptr = MHD_memmem (input_cert, input_cert_size, 799 ptr = memmem (input_cert, input_cert_size,
801 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1); 800 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
802 801
803 if (ptr == NULL) 802 if (ptr == NULL)
@@ -855,9 +854,9 @@ parse_pem_ca_mem (MHD_gnutls_x509_crt_t ** cert_list, unsigned *ncerts,
855 { 854 {
856 char *ptr3; 855 char *ptr3;
857 856
858 ptr3 = MHD_memmem (ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1); 857 ptr3 = memmem (ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
859 if (ptr3 == NULL) 858 if (ptr3 == NULL)
860 ptr3 = MHD_memmem (ptr, size, 859 ptr3 = memmem (ptr, size,
861 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1); 860 PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
862 861
863 ptr = (const opaque *) ptr3; 862 ptr = (const opaque *) ptr3;
@@ -977,7 +976,7 @@ parse_pem_crl_mem (MHD_gnutls_x509_crl_t ** crl_list, unsigned *ncrls,
977 976
978 /* move to the certificate 977 /* move to the certificate
979 */ 978 */
980 ptr = MHD_memmem (input_crl, input_crl_size, 979 ptr = memmem (input_crl, input_crl_size,
981 PEM_CRL_SEP, sizeof (PEM_CRL_SEP) - 1); 980 PEM_CRL_SEP, sizeof (PEM_CRL_SEP) - 1);
982 if (ptr == NULL) 981 if (ptr == NULL)
983 { 982 {
@@ -1033,7 +1032,7 @@ parse_pem_crl_mem (MHD_gnutls_x509_crl_t ** crl_list, unsigned *ncrls,
1033 size = input_crl_size - (ptr - input_crl); 1032 size = input_crl_size - (ptr - input_crl);
1034 1033
1035 if (size > 0) 1034 if (size > 0)
1036 ptr = MHD_memmem (ptr, size, PEM_CRL_SEP, sizeof (PEM_CRL_SEP) - 1); 1035 ptr = memmem (ptr, size, PEM_CRL_SEP, sizeof (PEM_CRL_SEP) - 1);
1037 else 1036 else
1038 ptr = NULL; 1037 ptr = NULL;
1039 i++; 1038 i++;