Merge commit '0b3f9a629f864ad1e68c5f5a73d11c93ae42d644' into jb/urcrypt-merge

* commit '0b3f9a629f864ad1e68c5f5a73d11c93ae42d644':
  Squashed 'pkg/urcrypt/argon2/' changes from 4da94a611e..a4c1e3f713

git subtree pull --prefix pkg/urcrypt/argon2 \
  git@github.com:urbit/argon2.git master --squash
This commit is contained in:
Joe Bryan 2021-08-19 20:05:34 -04:00
commit d6f30c5f6c

View File

@ -370,7 +370,7 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
#undef BIN
}
void itoa(int i, char b[]){
static void encode_decimal(int i, char b[]){
#ifdef ARGON2_JS
// because this generates WASM error:
@ -416,7 +416,7 @@ int encode_string(char *dst, size_t dst_len, argon2_context *ctx,
#define SX(x) \
do { \
char tmp[30]; \
itoa(x, tmp); \
encode_decimal(x, tmp); \
SS(tmp); \
} while ((void)0, 0)