diff --git a/tools/binctl b/tools/binctl index e2ec91e8..8c1de50d 100755 --- a/tools/binctl +++ b/tools/binctl @@ -14,8 +14,9 @@ def sign_data(seckey, data): digest = pyblake2.blake2s(data).digest() return signkey.sign(digest) + def format_sigmask(sigmask): - bits = [ str(b + 1) if sigmask & (1<> 2, q) @@ -39,6 +40,7 @@ def xrecover(y): x = q - x return x + By = 4 * inv(5) Bx = xrecover(By) B = [Bx % q, By % q] diff --git a/tools/keytool b/tools/keytool index 90995494..8688940e 100755 --- a/tools/keytool +++ b/tools/keytool @@ -77,7 +77,7 @@ def combinePubkeys(m, n): sum = None for j in range(0, n): if mask & (1 << j) != 0: - if sum == None: + if sum is None: sum = pks[j] else: sum = ed25519raw.edwards(sum, pks[j]) @@ -88,9 +88,8 @@ def combinePubkeys(m, n): def get_nonce(sk, data, ctr): h = ed25519raw.H(sk) b = ed25519raw.b - a = 2**(b - 2) + sum(2**i * ed25519raw.bit(h, i) for i in range(3, b - 2)) - r = ed25519raw.Hint(bytes([h[i] for i in range(b >> 3, b >> 2)]) + data + - binascii.unhexlify("%08x" % ctr)) + a = 2 ** (b - 2) + sum(2 ** i * ed25519raw.bit(h, i) for i in range(3, b - 2)) + r = ed25519raw.Hint(bytes([h[i] for i in range(b >> 3, b >> 2)]) + data + binascii.unhexlify('%08x' % ctr)) R = ed25519raw.scalarmult(ed25519raw.B, r) return (r, ed25519raw.encodepoint(R)) @@ -256,5 +255,6 @@ def test(): ed25519raw.checkvalid(sig, digest, globalPk) print('Valid Signature!') + if __name__ == '__main__': test() diff --git a/tools/pb2py b/tools/pb2py index e05bbcf8..c0546829 100755 --- a/tools/pb2py +++ b/tools/pb2py @@ -165,6 +165,7 @@ def write_to_file(genpath, t, out): f.write(data) f.close() + if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument('modulename', type=str, help="Name of module to generate") diff --git a/tools/png2toi b/tools/png2toi index aa15975e..096b6cdc 100755 --- a/tools/png2toi +++ b/tools/png2toi @@ -56,7 +56,7 @@ def process_image(ifn, savefiles=False): pixeldata = process_grayscale(w, h, pix) z = zlib.compressobj(level=9, wbits=10) zdata = z.compress(pixeldata) + z.flush() - zdata = zdata[2:-4] # strip header and checksum + zdata = zdata[2:-4] # strip header and checksum data = b'' if im.mode == 'RGB': diff --git a/tools/ttf2c b/tools/ttf2c index ff6c41bc..09956ce9 100755 --- a/tools/ttf2c +++ b/tools/ttf2c @@ -46,6 +46,7 @@ def process_face(name, style, size): f.write(' Font_%s_%s_%d_glyph_%d,\n' % (name, style, size, i)) f.write('};\n') + process_face('Roboto', 'Regular', 20) process_face('Roboto', 'Bold', 20) process_face('RobotoMono', 'Regular', 20)