Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
mbedtls
Commits
0ece0f94
Commit
0ece0f94
authored
May 12, 2015
by
Manuel Pégourié-Gonnard
Browse files
Fix checks for nul-termination
parent
24083d61
Changes
5
Hide whitespace changes
Inline
Side-by-side
library/dhm.c
View file @
0ece0f94
...
...
@@ -422,7 +422,7 @@ int mbedtls_dhm_parse_dhm( mbedtls_dhm_context *dhm, const unsigned char *dhmin,
mbedtls_pem_init
(
&
pem
);
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
dhmin
[
dhminlen
-
1
]
!=
'\0'
)
if
(
dhminlen
==
0
||
dhmin
[
dhminlen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
library/pkparse.c
View file @
0ece0f94
...
...
@@ -1072,7 +1072,7 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
#if defined(MBEDTLS_RSA_C)
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
key
[
keylen
-
1
]
!=
'\0'
)
if
(
keylen
==
0
||
key
[
keylen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
@@ -1105,7 +1105,7 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
#if defined(MBEDTLS_ECP_C)
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
key
[
keylen
-
1
]
!=
'\0'
)
if
(
keylen
==
0
||
key
[
keylen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
@@ -1136,7 +1136,7 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
#endif
/* MBEDTLS_ECP_C */
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
key
[
keylen
-
1
]
!=
'\0'
)
if
(
keylen
==
0
||
key
[
keylen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
@@ -1159,7 +1159,7 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
key
[
keylen
-
1
]
!=
'\0'
)
if
(
keylen
==
0
||
key
[
keylen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
@@ -1257,7 +1257,7 @@ int mbedtls_pk_parse_public_key( mbedtls_pk_context *ctx,
mbedtls_pem_init
(
&
pem
);
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
key
[
keylen
-
1
]
!=
'\0'
)
if
(
keylen
==
0
||
key
[
keylen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
library/x509_crl.c
View file @
0ece0f94
...
...
@@ -505,7 +505,7 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
mbedtls_pem_init
(
&
pem
);
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
buf
[
buflen
-
1
]
!=
'\0'
)
if
(
buflen
==
0
||
buf
[
buflen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
library/x509_crt.c
View file @
0ece0f94
...
...
@@ -852,7 +852,7 @@ int mbedtls_x509_crt_parse( mbedtls_x509_crt *chain, const unsigned char *buf, s
* one or more PEM certificates.
*/
#if defined(MBEDTLS_PEM_PARSE_C)
if
(
buf
[
buflen
-
1
]
==
'\0'
&&
if
(
buflen
!=
0
&&
buf
[
buflen
-
1
]
==
'\0'
&&
strstr
(
(
const
char
*
)
buf
,
"-----BEGIN CERTIFICATE-----"
)
!=
NULL
)
{
buf_format
=
MBEDTLS_X509_FORMAT_PEM
;
...
...
library/x509_csr.c
View file @
0ece0f94
...
...
@@ -276,7 +276,7 @@ int mbedtls_x509_csr_parse( mbedtls_x509_csr *csr, const unsigned char *buf, siz
mbedtls_pem_init
(
&
pem
);
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
if
(
buf
[
buflen
-
1
]
!=
'\0'
)
if
(
buflen
==
0
||
buf
[
buflen
-
1
]
!=
'\0'
)
ret
=
MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT
;
else
ret
=
mbedtls_pem_read_buffer
(
&
pem
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment