Hi,
<skip>
I was planning to send a separate patch, but since you moved
this code, maybe you could fix it here.
> +bool
> +tls_item_in_cipher_list(const char *item, const char *list)
> +{
> + char *tmp_ciphers = string_alloc(list, NULL);
> + char *tmp_ciphers_orig = tmp_ciphers;
This is redundant. strtok() manipulates string, but doesn't modify pointer,
unlike strsep. So it should be safe to to call
> free(tmp_ciphers)
instead of
> + free(tmp_ciphers_orig);
Same case as here:
https://sourceforge.net/p/openvpn/mailman/message/35421870/
Also could you apply following diff, which makes sure that
ssl_ncp.[ch] are displayed under correct Source/Headers folder in MSVC?
diff --git a/src/openvpn/openvpn.vcxproj.filters
b/src/openvpn/openvpn.vcxproj.filters
index 41e62d14..80eb52b3 100644
--- a/src/openvpn/openvpn.vcxproj.filters
+++ b/src/openvpn/openvpn.vcxproj.filters
@@ -243,6 +243,9 @@
<ClCompile Include="ring_buffer.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="ssl_ncp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="base64.h">
@@ -506,10 +509,13 @@
<ClInclude Include="ring_buffer.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ssl_ncp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="openvpn_win32_resources.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Other than that, looks good.
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
