diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-05-21 10:22:49 -0400 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-02 18:03:36 +0100 |
| commit | d2d0492245f85ea8e19cdab7b3608f6b4c31212b (patch) | |
| tree | 6892de40113544791ce6cf3f0004f3238dc88f6d /wsd/FileServer.cpp | |
| parent | wsd: overload getTokenInteger for string-literals (diff) | |
| download | online-d2d0492245f85ea8e19cdab7b3608f6b4c31212b.tar.gz online-d2d0492245f85ea8e19cdab7b3608f6b4c31212b.zip | |
wsd: move LOOLProtocol::tokenize to Util::tokenize
The tokenizer(s) are more generic than the protocol
logic, and are used from contexts that don't involve
the protocol as such.
Change-Id: Ie8c256bf11a91e466bff794021f41603c9596a7f
Diffstat (limited to 'wsd/FileServer.cpp')
| -rw-r--r-- | wsd/FileServer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index e833a7f829..1c47b0f8da 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -150,7 +150,7 @@ bool isConfigAuthOk(const std::string& userProvidedUsr, const std::string& userP #if HAVE_PKCS5_PBKDF2_HMAC // Extract the salt from the config std::vector<unsigned char> saltData; - StringVector tokens = LOOLProtocol::tokenize(securePass, '.'); + StringVector tokens = Util::tokenize(securePass, '.'); if (tokens.size() != 5 || !tokens.equals(0, "pbkdf2") || !tokens.equals(1, "sha512") || |