diff options
| author | Simon Josefsson <simon@josefsson.org> | 2004-09-30 21:37:27 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2004-09-30 21:37:27 +0000 |
| commit | a46f9a863275ca38a2322cef2161109dc6cb87e8 (patch) | |
| tree | 62b4c67ea69a9c9d3d93c343b48d61f7516fba60 /lib | |
| parent | 44d4ec16a698efebbdf4e49c3bee2adceba27fd2 (diff) | |
| download | gnutls-a46f9a863275ca38a2322cef2161109dc6cb87e8.tar.gz | |
Replace strnstr with memstr. See discussion on bug-gnulib list.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/defines.h | 2 | ||||
| -rw-r--r-- | lib/gnutls_x509.c | 22 | ||||
| -rw-r--r-- | lib/x509_b64.c | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/defines.h b/lib/defines.h index 808f08363b..267fe43cf2 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -40,7 +40,7 @@ typedef int ssize_t; # include <strings.h> #endif -#include <strnstr.h> +#include <memstr.h> #ifdef HAVE_STDDEF_H # include <stddef.h> diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c index 9b2c3ecc10..e5dc7e5229 100644 --- a/lib/gnutls_x509.c +++ b/lib/gnutls_x509.c @@ -439,7 +439,7 @@ static int parse_pem_cert_mem(gnutls_cert ** cert_list, uint * ncerts, #ifdef ENABLE_PKI if ((ptr = - strnstr(input_cert, PEM_PKCS7_SEP, input_cert_size)) != NULL) { + memstr(input_cert, PEM_PKCS7_SEP, input_cert_size)) != NULL) { size = strlen(ptr); ret = parse_pkcs7_cert_mem(cert_list, ncerts, ptr, size, CERT_PEM); @@ -450,9 +450,9 @@ static int parse_pem_cert_mem(gnutls_cert ** cert_list, uint * ncerts, /* move to the certificate */ - ptr = strnstr(input_cert, PEM_CERT_SEP, input_cert_size); + ptr = memstr(input_cert, PEM_CERT_SEP, input_cert_size); if (ptr == NULL) - ptr = strnstr(input_cert, PEM_CERT_SEP2, input_cert_size); + ptr = memstr(input_cert, PEM_CERT_SEP2, input_cert_size); if (ptr == NULL) { gnutls_assert(); @@ -502,9 +502,9 @@ static int parse_pem_cert_mem(gnutls_cert ** cert_list, uint * ncerts, if (size > 0) { char *ptr2; - ptr2 = strnstr(ptr, PEM_CERT_SEP, size); + ptr2 = memstr(ptr, PEM_CERT_SEP, size); if (ptr2 == NULL) - ptr2 = strnstr(ptr, PEM_CERT_SEP2, size); + ptr2 = memstr(ptr, PEM_CERT_SEP2, size); ptr = ptr2; } else @@ -1123,9 +1123,9 @@ static int parse_pem_ca_mem(gnutls_x509_crt_t ** cert_list, uint * ncerts, /* move to the certificate */ - ptr = strnstr(input_cert, PEM_CERT_SEP, input_cert_size); + ptr = memstr(input_cert, PEM_CERT_SEP, input_cert_size); if (ptr == NULL) - ptr = strnstr(input_cert, PEM_CERT_SEP2, input_cert_size); + ptr = memstr(input_cert, PEM_CERT_SEP2, input_cert_size); if (ptr == NULL) { gnutls_assert(); @@ -1177,9 +1177,9 @@ static int parse_pem_ca_mem(gnutls_x509_crt_t ** cert_list, uint * ncerts, if (size > 0) { char *ptr2; - ptr2 = strnstr(ptr, PEM_CERT_SEP, size); + ptr2 = memstr(ptr, PEM_CERT_SEP, size); if (ptr2 == NULL) - ptr = strnstr(ptr, PEM_CERT_SEP2, size); + ptr = memstr(ptr, PEM_CERT_SEP2, size); ptr = ptr2; } else @@ -1395,7 +1395,7 @@ static int parse_pem_crl_mem(gnutls_x509_crl_t ** crl_list, uint * ncrls, /* move to the certificate */ - ptr = strnstr(input_crl, PEM_CRL_SEP, input_crl_size); + ptr = memstr(input_crl, PEM_CRL_SEP, input_crl_size); if (ptr == NULL) { gnutls_assert(); return GNUTLS_E_BASE64_DECODING_ERROR; @@ -1445,7 +1445,7 @@ static int parse_pem_crl_mem(gnutls_x509_crl_t ** crl_list, uint * ncrls, size = input_crl_size - (ptr - input_crl); if (size > 0) - ptr = strnstr(ptr, PEM_CRL_SEP, size); + ptr = memstr(ptr, PEM_CRL_SEP, size); else ptr = NULL; i++; diff --git a/lib/x509_b64.c b/lib/x509_b64.c index 61b8fdfe51..3a5f06140f 100644 --- a/lib/x509_b64.c +++ b/lib/x509_b64.c @@ -413,7 +413,7 @@ int _gnutls_fbase64_decode(const char *header, const opaque * data, if (header != NULL) _gnutls_str_cat(pem_header, sizeof(pem_header), header); - rdata = strnstr(data, pem_header, data_size); + rdata = memstr(data, pem_header, data_size); if (rdata == NULL) { gnutls_assert(); @@ -428,11 +428,11 @@ int _gnutls_fbase64_decode(const char *header, const opaque * data, return GNUTLS_E_BASE64_DECODING_ERROR; } - kdata = strnstr(rdata, ENDSTR, data_size); + kdata = memstr(rdata, ENDSTR, data_size); /* allow CR as well. */ if (kdata == NULL) - kdata = strnstr(rdata, ENDSTR2, data_size); + kdata = memstr(rdata, ENDSTR2, data_size); if (kdata == NULL) { gnutls_assert(); @@ -446,7 +446,7 @@ int _gnutls_fbase64_decode(const char *header, const opaque * data, /* position is now after the ---BEGIN--- headers */ - kdata = strnstr(rdata, bottom, data_size); + kdata = memstr(rdata, bottom, data_size); if (kdata == NULL) { gnutls_assert(); return GNUTLS_E_BASE64_DECODING_ERROR; |