Page MenuHomeWildfire Games
Differential D1428

Use libsodium for crypto
ClosedPublic
Actions

Authored by Itms on Apr 2 2018, 3:44 PM.

Details

Reviewers
None
Group Reviewers
Windows Developers
macOS Developers
Commits
rP21674: Use libsodium for cryptography.
Summary

In preparation for D1029, we should include libsodium and use it where we can for cryptographic stuff.

This revision adds the lib for Windows and uses it for SHA256 hashing in the lobby. MD5 is not provided by libsodium.

You will need a recent version of libsodium, which might not be in your repos. I manually installed 1.0.16 on Jenkins.

Test Plan

Compile and test, verify that you can still connect to the lobby if you erase the hash stored in the config file and retype your password.

Check that building with premake4 still works (as it should still be supported in A23).

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Itms created this revision.Apr 2 2018, 3:44 PM
Itms planned changes to this revision.Apr 6 2018, 1:43 PM

Note to self: forgot to add a script for OSX, P117 has to be tested.

Itms updated this revision to Diff 6348.Apr 8 2018, 1:50 PM

Now with the OSX library build script.

Itms added reviewers: Windows Developers, macOS Developers.Apr 8 2018, 1:52 PM

Thanks in advance for testing! :)

Vulcan added a subscriber: Vulcan.Apr 8 2018, 1:55 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/362/display/redirect

Harbormaster failed remote builds in B5795: Diff 6348!Apr 8 2018, 1:55 PM
Vulcan added a comment.Apr 8 2018, 3:09 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/363/display/redirect

Harbormaster failed remote builds in B5795: Diff 6348!Apr 8 2018, 3:09 PM
Imarok added a subscriber: Imarok.EditedApr 8 2018, 4:53 PM

Doesn't work for me.
I get "Incorrect password or username" when trying to log into lobby.

Itms planned changes to this revision.Apr 8 2018, 5:10 PM

I seem to have made a mistake with pbkdf2. Looking into it...

Itms updated this revision to Diff 6350.Apr 8 2018, 5:47 PM

Don't use libsodium crypto_auth_hmacsha256, which does not match our implementation.

Vulcan added a comment.Apr 8 2018, 6:17 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/365/display/redirect

Harbormaster completed remote builds in B5799: Diff 6350.Apr 8 2018, 6:17 PM
Imarok added a comment.Apr 8 2018, 7:06 PM

Works on linux. (tested with premake4, premake5 and premake5-debug)

Itms updated this revision to Diff 6353.Apr 8 2018, 11:10 PM

Fix empty binary files.

This revision was not accepted when it landed; it landed in state Needs Review.Apr 8 2018, 11:41 PM
Closed by commit rP21674: Use libsodium for cryptography. (authored by Itms). · Explain Why
This revision was automatically updated to reflect the committed changes.
Vulcan added a comment.Apr 9 2018, 12:05 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/368/display/redirect

Harbormaster completed remote builds in B5804: Diff 6353.Apr 9 2018, 12:05 AM

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
system/
build/
premake/
16 lines
16 lines
5 lines
5 lines
libraries/
osx/
31 lines
win32/
libsodium/
include/
70 lines
sodium/
28 lines
171 lines
174 lines
97 lines
44 lines
68 lines
67 lines
62 lines
173 lines
159 lines
109 lines
37 lines
35 lines
35 lines
35 lines
35 lines
39 lines
75 lines
117 lines
40 lines
57 lines
57 lines
51 lines
42 lines
64 lines
62 lines
67 lines
147 lines
122 lines
122 lines
120 lines
45 lines
40 lines
41 lines
91 lines
68 lines
67 lines
102 lines
39 lines
48 lines
103 lines
114 lines
55 lines
56 lines
98 lines
57 lines
50 lines
56 lines
57 lines
57 lines
23 lines
23 lines
23 lines
53 lines
68 lines
19 lines
19 lines
52 lines
170 lines
33 lines
lib/
source/
lobby/
scripting/
30 lines
third_party/
encryption/
7 lines
86 lines
39 lines
266 lines
tests/
22 lines
57 lines

Diff 6354

View Options

ps/trunk/binaries/system/libsodium.dll

Loading...
View Options

ps/trunk/binaries/system/libsodiumd.dll

Loading...
View Options

ps/trunk/build/premake/extern_libs4.lua

Loading...
View Options

ps/trunk/build/premake/extern_libs5.lua

Loading...
View Options

ps/trunk/build/premake/premake4.lua

Loading...
View Options

ps/trunk/build/premake/premake5.lua

Loading...
View Options

ps/trunk/libraries/osx/build-osx-libs.sh

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/core.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_aead_aes256gcm.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_aead_chacha20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_auth.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_auth_hmacsha256.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_auth_hmacsha512.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_auth_hmacsha512256.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_box.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_ed25519.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_hchacha20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_hsalsa20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_salsa20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_salsa2012.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_core_salsa208.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_generichash.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_generichash_blake2b.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_hash.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_hash_sha256.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_hash_sha512.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_kdf.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_kdf_blake2b.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_kx.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_onetimeauth.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_onetimeauth_poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_pwhash.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_pwhash_argon2i.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_pwhash_argon2id.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_scalarmult.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_scalarmult_curve25519.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_scalarmult_ed25519.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_secretbox.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_secretstream_xchacha20poly1305.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_shorthash.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_shorthash_siphash24.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_sign.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_sign_ed25519.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_chacha20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_salsa20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_salsa2012.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_salsa208.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_xchacha20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_stream_xsalsa20.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_verify_16.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_verify_32.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/crypto_verify_64.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/export.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/randombytes.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/randombytes_salsa20_random.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/randombytes_sysrandom.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/runtime.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/utils.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/include/sodium/version.h

Loading...
View Options

ps/trunk/libraries/win32/libsodium/lib/libsodium.lib

Loading...
View Options

ps/trunk/libraries/win32/libsodium/lib/libsodiumd.lib

Loading...
View Options

ps/trunk/source/lobby/scripting/JSInterface_Lobby.cpp

Loading...
View Options

ps/trunk/source/third_party/encryption/pkcs5_pbkdf2.h

Loading...
View Options

ps/trunk/source/third_party/encryption/pkcs5_pbkdf2.cpp

Loading...
View Options

ps/trunk/source/third_party/encryption/sha.h

Loading...
View Options

ps/trunk/source/third_party/encryption/sha.cpp

Loading...
View Options

ps/trunk/source/third_party/encryption/tests/test_pkcs5_pbkdf5.h

Loading...
View Options

ps/trunk/source/third_party/encryption/tests/test_sha.h

Loading...
Wildfire Games · Phabricator