diff --git a/README.md b/README.md index 1d6246d32..cdae667cc 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Libraries and other assets used * [LuaJIT](https://luajit.org/) * [LuaSocket](http://w3.impa.br/~diego/software/luasocket/) * [Mallangche](https://github.com/JammPark/Mallangche) +* [mbedtls](https://www.trustedfirmware.org/projects/mbed-tls/) * [SDL](https://libsdl.org/) * [zlib](https://www.zlib.net/) @@ -57,7 +58,6 @@ Instructions Click on the elements with the mouse and draw in the field, like in MS Paint. The rest of the game is learning what happens next. - Controls =========================================================================== @@ -108,8 +108,6 @@ Controls | Ctrl + Shift + R | Vertical mirror for selected area when pasting stamps | | R | Rotate selected area counterclockwise when pasting stamps | - - Command Line --------------------------------------------------------------------------- @@ -123,3 +121,5 @@ Command Line | `ptsave:SAVEID` | Open online save, used by ptsave: URLs | `ptsave:2198` | | `disable-network` | Disables internet connections | | | `redirect` | Redirects output to stdout.txt / stderr.txt | | +| `cafile:CAFILE` | Set certificate bundle path | `cafile:/etc/ssl/certs/ca-certificates.crt` | +| `capath:CAPATH` | Set certificate directory path | `capath:/etc/ssl/certs` | diff --git a/meson.build b/meson.build index 6d7de3453..6930aefb5 100644 --- a/meson.build +++ b/meson.build @@ -114,9 +114,7 @@ endif lua_variant = get_option('lua') if lua_variant == 'auto' lua_variant = 'luajit' - # TODO: sometimes luajit is not available endif -# TODO: check UNICODE on windows if lua_variant == 'none' lua_dep = [] elif lua_variant == 'lua5.1' or lua_variant == 'lua5.2' @@ -153,7 +151,7 @@ fftw_dep = enable_gravfft ? dependency('fftw3f', static: is_static) : [] threads_dep = dependency('threads') zlib_dep = dependency('zlib', static: is_static) -sdl2_dep = dependency('sdl2', static: is_static) # TODO: check UNICODE on windows +sdl2_dep = dependency('sdl2', static: is_static) project_link_args = [] project_c_args = [] diff --git a/src/client/Client.cpp b/src/client/Client.cpp index 34ac2e2e6..9f2fe64e7 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -263,6 +263,11 @@ bool Client::CheckUpdate(http::Request *updateRequest, bool checkSession) int status; ByteString data = updateRequest->Finish(&status); + if (checkSession && status == 618) + { + AddServerNotification({ "Failed to load SSL certificates", SCHEME "powdertoy.co.uk/FAQ.html" }); + } + if (status != 200) { //free(data);