plaisthos has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/1679?usp=email )
Change subject: Replace strtok with strtok_r ...................................................................... Replace strtok with strtok_r This dos not change anything in our source code but makes compiling with newer Android NDKs (version 30 pre release) -Werror safe again as it has started throwing warning on this. Change-Id: I70560efd113308b7377424127eb2c1da4266371a Signed-off-by: Arne Schwabe <[email protected]> --- M src/openvpn/options_util.c M src/openvpn/ssl_mbedtls.c M src/openvpn/ssl_ncp.c M src/openvpn/ssl_verify.c 4 files changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/79/1679/1 diff --git a/src/openvpn/options_util.c b/src/openvpn/options_util.c index 47fe0bc..fbc64fa 100644 --- a/src/openvpn/options_util.c +++ b/src/openvpn/options_util.c @@ -48,7 +48,8 @@ message = strstr(reason, "]") + 1; /* null terminate the substring to only looks for flags between [ and ] */ *endofflags = '\x00'; - const char *token = strtok(m, "[,"); + char *lasts; + const char *token = strtok_r(m, "[,", &lasts); while (token) { if (!strncmp(token, "backoff ", strlen("backoff "))) @@ -81,7 +82,7 @@ { msg(D_PUSH_ERRORS, "WARNING: unknown AUTH_FAIL,TEMP flag: %s", token); } - token = strtok(NULL, "[,"); + token = strtok_r(NULL, "[,", &lasts); } } diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 8a0f7d2..7f0af3f 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -318,9 +318,10 @@ /* Parse allowed ciphers, getting IDs */ int i = 0; + char *lasts; tmp_ciphers_orig = tmp_ciphers = string_alloc(ciphers, NULL); - token = strtok(tmp_ciphers, ":"); + token = strtok_r(tmp_ciphers, ":", &lasts); while (token) { ctx->allowed_ciphers[i] = mbedtls_ssl_get_ciphersuite_id(tls_translate_cipher_name(token)); @@ -328,7 +329,7 @@ { i++; } - token = strtok(NULL, ":"); + token = strtok_r(NULL, ":", &lasts); } free(tmp_ciphers_orig); } diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c index 649665a..33f33ef 100644 --- a/src/openvpn/ssl_ncp.c +++ b/src/openvpn/ssl_ncp.c @@ -100,7 +100,8 @@ struct buffer new_list = alloc_buf(MAX_NCP_CIPHERS_LENGTH); char *const tmp_ciphers = string_alloc(list, NULL); - const char *token = strtok(tmp_ciphers, ":"); + char *lasts; + const char *token = strtok_r(tmp_ciphers, ":", &lasts); while (token) { /* @@ -174,7 +175,7 @@ buf_puts(&new_list, ovpn_cipher_name); } } - token = strtok(NULL, ":"); + token = strtok_r(NULL, ":", &lasts); } @@ -207,15 +208,16 @@ { char *tmp_ciphers = string_alloc(list, NULL); char *tmp_ciphers_orig = tmp_ciphers; + char *lasts; - const char *token = strtok(tmp_ciphers, ":"); + const char *token = strtok_r(tmp_ciphers, ":", &lasts); while (token) { if (0 == strcmp(token, item)) { break; } - token = strtok(NULL, ":"); + token = strtok_r(NULL, ":", &lasts); } free(tmp_ciphers_orig); diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 0804d2d..8c6e2bc 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -868,7 +868,8 @@ return false; } - const char *client_method = strtok(iv_sso, ","); + char *lasts; + const char *client_method = strtok_r(iv_sso, ",", &lasts); bool supported = false; while (client_method) @@ -878,7 +879,7 @@ supported = true; break; } - client_method = strtok(NULL, ","); + client_method = strtok_r(NULL, ",", &lasts); } gc_free(&gc); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1679?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I70560efd113308b7377424127eb2c1da4266371a Gerrit-Change-Number: 1679 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
