mleku/libbase58
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from luke-jr/avoid_ssize_t

Browse Source 
Avoid ssize_t
This commit is contained in:
Luke Dashjr
2018-06-03 23:14:43 +00:00
committed by GitHub
parent afa117ae92 4aaeea028c
commit 1c9930a246
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -33,6 +33,7 @@ TESTS = \
tests/decode-zero.sh \ tests/decode-zero.sh \
tests/encode.sh \ tests/encode.sh \
tests/encode-b58c.sh \ tests/encode-b58c.sh \
tests/encode-b58c-high.sh \
tests/encode-fail.sh \ tests/encode-fail.sh \
tests/encode-neg-index.sh \ tests/encode-neg-index.sh \
tests/encode-small.sh tests/encode-small.sh

7
base58.c
View File

@@ -15,7 +15,6 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include "libbase58.h" #include "libbase58.h"
@@ -147,7 +146,7 @@ bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz)
{ {
const uint8_t *bin = data; const uint8_t *bin = data;
int carry; int carry;
ssize_t i, j, high, zcount = 0; size_t i, j, high, zcount = 0;
size_t size; size_t size;
while (zcount < binsz && !bin[zcount]) while (zcount < binsz && !bin[zcount])
@@ -164,6 +163,10 @@ bool b58enc(char *b58, size_t *b58sz, const void *data, size_t binsz)
carry += 256 * buf[j]; carry += 256 * buf[j];
buf[j] = carry % 58; buf[j] = carry % 58;
carry /= 58; carry /= 58;
if (!j) {
// Otherwise j wraps to maxint which is > high
break;
}
} }
} }

3
tests/encode-b58c-high.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
b58=$(echo 'ff5a1fc5dd9e6f03819fca94a2d89669469667f9a0' | xxd -r -p | base58 -c)
test x$b58 = x2mkQLxaN3Y4CwN5E9rdMWNgsXX7VS6UnfeT