From 320edd4b0ea4e0deeb33fcb1e22019f2b33ef026 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 7 Aug 2026 09:37:48 +0000 Subject: [PATCH] Crypto.add_user_random(): increase dfl `osrand_bytes` to 32 --- mmgen/crypto.py | 3 ++- mmgen/data/version | 2 +- mmgen/wallet/dieroll.py | 1 - test/overlay/fakemods/mmgen/crypto.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mmgen/crypto.py b/mmgen/crypto.py index bbcf1979..988b42d3 100755 --- a/mmgen/crypto.py +++ b/mmgen/crypto.py @@ -305,6 +305,7 @@ class Crypto: return self.add_user_random( rand_bytes = os_rand, + osrand_bytes = 8, # we’ve already gathered OS entropy, so reduce desc = 'from your operating system') def add_user_random( @@ -312,7 +313,7 @@ class Crypto: rand_bytes, *, desc, - osrand_bytes = 8, + osrand_bytes = 32, urand = {'data': b'', 'counter': 0}): assert type(rand_bytes) is bytes, 'add_user_random_chk1' diff --git a/mmgen/data/version b/mmgen/data/version index 244b9ed7..554874d0 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -16.2.dev6 +16.2.dev7 diff --git a/mmgen/wallet/dieroll.py b/mmgen/wallet/dieroll.py index 75af97d0..f599e770 100755 --- a/mmgen/wallet/dieroll.py +++ b/mmgen/wallet/dieroll.py @@ -59,7 +59,6 @@ class wallet(wallet): from ..crypto import Crypto seed_bytes = Crypto(self.cfg).add_user_random( rand_bytes = seed_bytes, - osrand_bytes = 32, desc = 'gathered from your die rolls') self.desc += ' plus OS and user-supplied entropy' msg('') diff --git a/test/overlay/fakemods/mmgen/crypto.py b/test/overlay/fakemods/mmgen/crypto.py index fe6dfd49..fd2694b4 100644 --- a/test/overlay/fakemods/mmgen/crypto.py +++ b/test/overlay/fakemods/mmgen/crypto.py @@ -11,5 +11,5 @@ if overlay_fake_os.getenv('MMGEN_TEST_SUITE_DETERMINISTIC'): Crypto.get_random = lambda self, length: overlay_fake_urandom( len(overlay_fake_get_random_orig(self, length))) - Crypto.add_user_random = lambda self, rand_bytes, *, desc, osrand_bytes=8: overlay_fake_urandom( + Crypto.add_user_random = lambda self, rand_bytes, *, desc, osrand_bytes=32: overlay_fake_urandom( len(overlay_fake_add_user_random_orig(self, rand_bytes, desc=desc, osrand_bytes=osrand_bytes)))