Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

polyseed: use Qt for Unicode normalization

Browse source 
Boost is unreliable for this purpose
This commit is contained in:
tobtoht 2023-06-10 22:37:29 +02:00
parent 1d515d8e93
commit 744c892ba0
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/polyseed/polyseed.cpp
View file

@ -9,17 +9,18 @@
#include <sodium/randombytes.h> #include <sodium/randombytes.h>
#include <boost/locale.hpp> #include <boost/locale.hpp>
#include <cstdint>
#include <cstring>
#include <algorithm>
#include <array> #include <array>
#include <QString>
namespace polyseed { namespace polyseed {
static std::locale locale; static std::locale locale;
static size_t utf8_nfc(const char* str, polyseed_str norm) { static size_t utf8_nfc(const char* str, polyseed_str norm) {
auto s = boost::locale::normalize(str, boost::locale::norm_type::norm_nfc, locale); auto Qstr = QString(str);
auto Qs = Qstr.normalized(QString::NormalizationForm_C);
auto s = Qs.toStdString();
size_t size = std::min(s.size(), (size_t)POLYSEED_STR_SIZE - 1); size_t size = std::min(s.size(), (size_t)POLYSEED_STR_SIZE - 1);
s.copy(norm, size); s.copy(norm, size);
norm[size] = '\0'; norm[size] = '\0';
@ -28,7 +29,9 @@ namespace polyseed {
} }
static size_t utf8_nfkd(const char* str, polyseed_str norm) { static size_t utf8_nfkd(const char* str, polyseed_str norm) {
auto s = boost::locale::normalize(str, boost::locale::norm_type::norm_nfkd, locale); auto Qstr = QString(str);
auto Qs = Qstr.normalized(QString::NormalizationForm_KD);
auto s = Qs.toStdString();
size_t size = std::min(s.size(), (size_t)POLYSEED_STR_SIZE - 1); size_t size = std::min(s.size(), (size_t)POLYSEED_STR_SIZE - 1);
s.copy(norm, size); s.copy(norm, size);
norm[size] = '\0'; norm[size] = '\0';