Merge branch 'master' into ml-dsa-sign-with-context

Author: danielinux

scripts/build_ffi.py

@@ -26,7 +26,6 @@
 from distutils.util import get_platform
 from cffi import FFI
 import shutil
-import glob
 from wolfcrypt._version import __wolfssl_version__ as version
 
 def local_path(path):
@@ -332,7 +331,7 @@ def get_features(local_wolfssl, features):
 
     for d in include_dirs:
         if not os.path.exists(d):
-            e = "Invalid wolfSSL include dir: .".format(d)
+            e = f"Invalid wolfSSL include dir: {d}"
             raise FileNotFoundError(e)
 
         options = os.path.join(d, "wolfssl", "options.h")
@@ -543,6 +542,8 @@ def build_ffi(local_wolfssl, features):
         typedef struct { ...; } OS_Seed;
 
         int wc_InitRng(WC_RNG*);
+        int wc_InitRngNonce(WC_RNG*, byte*, word32);
+        int wc_InitRngNonce_ex(WC_RNG*, byte*, word32, void*, int);
         int wc_RNG_GenerateBlock(WC_RNG*, byte*, word32);
         int wc_RNG_GenerateByte(WC_RNG*, byte*);
         int wc_FreeRng(WC_RNG*);
@@ -1032,6 +1033,8 @@ def build_ffi(local_wolfssl, features):
         int wc_dilithium_import_public(const byte* in, word32 inLen, dilithium_key* key);
         int wc_dilithium_sign_msg(const byte* msg, word32 msgLen, byte* sig, word32* sigLen, dilithium_key* key, WC_RNG* rng);
         int wc_dilithium_sign_ctx_msg(const byte* ctx, byte ctxLen, const byte* msg, word32 msgLen, byte* sig, word32* sigLen, dilithium_key* key, WC_RNG* rng);
+        int wc_dilithium_sign_msg_with_seed(const byte* msg, word32 msgLen, byte* sig, word32* sigLen, dilithium_key* key, const byte* seed);
+        int wc_dilithium_sign_ctx_msg_with_seed(const byte* ctx, byte ctxLen, const byte* msg, word32 msgLen, byte* sig, word32* sigLen, dilithium_key* key, const byte* seed);
         int wc_dilithium_verify_msg(const byte* sig, word32 sigLen, const byte* msg, word32 msgLen, int* res, dilithium_key* key);
         int wc_dilithium_verify_ctx_msg(const byte* sig, word32 sigLen, const byte* ctx, word32 ctxLen, const byte* msg, word32 msgLen, int* res, dilithium_key* key);
         typedef dilithium_key MlDsaKey;

setup.py

@@ -22,12 +22,12 @@
 # pylint: disable=wrong-import-position
 
 import os
+import re
 import sys
 from setuptools import setup, find_packages
 
 os.chdir(os.path.dirname(sys.argv[0]) or ".")
 
-import re
 VERSIONFILE = "wolfcrypt/_version.py"
 verstrline = open(VERSIONFILE, "rt").read()
 VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"

tests/test_aesgcmstream.py

@@ -23,11 +23,10 @@
 from wolfcrypt._ffi import lib as _lib
 
 if _lib.AESGCM_STREAM_ENABLED:
-    from collections import namedtuple
     import pytest
     from wolfcrypt.utils import t2b
     from wolfcrypt.exceptions import WolfCryptError
-    from binascii import hexlify as b2h, unhexlify as h2b
+    from binascii import hexlify as b2h
     from wolfcrypt.ciphers import AesGcmStream
 
     def test_encrypt():

tests/test_chacha20poly1305.py

@@ -27,7 +27,7 @@
     import pytest
     from wolfcrypt.utils import t2b
     from wolfcrypt.exceptions import WolfCryptError
-    from binascii import hexlify as b2h, unhexlify as h2b
+    from binascii import unhexlify as h2b
     from wolfcrypt.ciphers import ChaCha20Poly1305
 
     def test_encrypt_decrypt():

tests/test_ciphers.py

@@ -23,8 +23,8 @@
 from collections import namedtuple
 import random
 import pytest
-from wolfcrypt._ffi import ffi as _ffi
 from wolfcrypt._ffi import lib as _lib
+from wolfcrypt.ciphers import MODE_CTR, MODE_ECB, MODE_CBC, WolfCryptError
 from wolfcrypt.utils import t2b, h2b
 import os
 
@@ -43,20 +43,16 @@
     from wolfcrypt.ciphers import ChaCha
 
 if _lib.RSA_ENABLED:
-    from wolfcrypt.ciphers import (RsaPrivate, RsaPublic, HASH_TYPE_SHA256, MGF1SHA256, HASH_TYPE_SHA, MGF1SHA1)
+    from wolfcrypt.ciphers import RsaPrivate, RsaPublic, HASH_TYPE_SHA256, HASH_TYPE_SHA
 
 if _lib.ECC_ENABLED:
-    from wolfcrypt.ciphers import (EccPrivate, EccPublic)
+    from wolfcrypt.ciphers import EccPrivate, EccPublic
 
 if _lib.ED25519_ENABLED:
-    from wolfcrypt.ciphers import (Ed25519Private, Ed25519Public)
+    from wolfcrypt.ciphers import Ed25519Private, Ed25519Public
 
 if _lib.ED448_ENABLED:
-    from wolfcrypt.ciphers import (Ed448Private, Ed448Public)
-
-from wolfcrypt.ciphers import (
-    MODE_CTR, MODE_ECB, MODE_CBC, WolfCryptError
-)
+    from wolfcrypt.ciphers import Ed448Private, Ed448Public
 
 
 @pytest.fixture

tests/test_hashes.py

@@ -22,7 +22,6 @@
 
 from collections import namedtuple
 import pytest
-from wolfcrypt._ffi import ffi as _ffi
 from wolfcrypt._ffi import lib as _lib
 from wolfcrypt.utils import t2b
 

tests/test_mldsa.py

@@ -25,7 +25,7 @@
 if _lib.ML_DSA_ENABLED:
     import pytest
 
-    from wolfcrypt.ciphers import MlDsaPrivate, MlDsaPublic, MlDsaType
+    from wolfcrypt.ciphers import MlDsaPrivate, MlDsaPublic, MlDsaType, ML_DSA_SIGNATURE_SEED_LENGTH
     from wolfcrypt.random import Random
 
     @pytest.fixture
@@ -134,7 +134,7 @@ def test_sign_verify(mldsa_type, rng):
         # Verify with wrong message
         wrong_message = b"This is a wrong message for ML-DSA signature"
         assert not mldsa_pub.verify(signature, wrong_message)
-
+        
         # Verify a signature generated without a context but where a context
         # is provided during verify
         ctx = b"This is a test context for ML-DSA signature"
@@ -156,3 +156,51 @@ def test_sign_verify(mldsa_type, rng):
 
         # Verify with wrong context
         assert not mldsa_pub.verify(signature, message, ctx=wrong_ctx)
+
+    def test_sign_with_seed(mldsa_type, rng):
+        signature_seed = rng.bytes(ML_DSA_SIGNATURE_SEED_LENGTH)
+        mldsa_priv = MlDsaPrivate.make_key(mldsa_type, rng)
+        pub_key = mldsa_priv.encode_pub_key()
+
+        # Import public key
+        mldsa_pub = MlDsaPublic(mldsa_type)
+        mldsa_pub.decode_key(pub_key)
+
+        # Sign a message
+        message = b"This is a test message for ML-DSA signature"
+        signature = mldsa_priv.sign_with_seed(message, signature_seed)
+        assert len(signature) == mldsa_priv.sig_size
+
+        # Verify the signature using public key
+        assert mldsa_pub.verify(signature, message)
+
+        # re-generate from the same seed:
+        signature_from_same_seed = mldsa_priv.sign_with_seed(message, signature_seed)
+        assert signature == signature_from_same_seed
+
+        # test that the seed size is checked:
+        with pytest.raises(ValueError):
+            _ = mldsa_priv.sign_with_seed(message, signature_seed[:-1])
+
+        # test that the seed type is checked (should be bytes-like, not string)
+        with pytest.raises(TypeError):
+            _ = mldsa_priv.sign_with_seed(message, "")
+
+    def test_sign_with_seed_and_context(mldsa_type, rng):
+        signature_seed = rng.bytes(ML_DSA_SIGNATURE_SEED_LENGTH)
+        mldsa_priv = MlDsaPrivate.make_key(mldsa_type, rng)
+        pub_key = mldsa_priv.encode_pub_key()
+
+        # Import public key
+        mldsa_pub = MlDsaPublic(mldsa_type)
+        mldsa_pub.decode_key(pub_key)
+
+        # Sign a message
+        message = b"This is a test message for ML-DSA signature"
+        context = b"Some context for the signature"
+        signature = mldsa_priv.sign_with_seed(message, signature_seed, ctx=context)
+        assert len(signature) == mldsa_priv.sig_size
+        # test that the context length is checked (more than 255 bytes is invalid):
+        with pytest.raises(ValueError):
+            _ = mldsa_priv.sign_with_seed(message, signature_seed[:-1], ctx=bytes(1000))
+

tests/test_random.py

@@ -37,3 +37,14 @@ def test_bytes(rng):
     assert len(rng.bytes(1)) == 1
     assert len(rng.bytes(8)) == 8
     assert len(rng.bytes(128)) == 128
+
+@pytest.fixture
+def rng_nonce():
+    return Random(b"abcdefghijklmnopqrstuv")
+
+def test_nonce_byte(rng_nonce):
+    assert len(rng_nonce.byte()) == 1
+
+@pytest.mark.parametrize("length", (1, 8, 128))
+def test_nonce_bytes(rng_nonce, length):
+    assert len(rng_nonce.bytes(length)) == length

wolfcrypt/__init__.py

@@ -46,15 +46,15 @@
 if top_level_py not in ["setup.py", "build_ffi.py"]:
     from wolfcrypt._ffi import ffi as _ffi
     from wolfcrypt._ffi import lib as _lib
+    from wolfcrypt.exceptions import WolfCryptError
 
     if hasattr(_lib, 'WC_RNG_SEED_CB_ENABLED'):
         if _lib.WC_RNG_SEED_CB_ENABLED:
             ret = _lib.wc_SetSeed_Cb(_ffi.addressof(_lib, "wc_GenerateSeed"))
             if ret < 0:
                 raise WolfCryptError("wc_SetSeed_Cb failed (%d)" % ret)
     if _lib.FIPS_ENABLED and _lib.FIPS_VERSION >= 5:
-        ret = _lib.wolfCrypt_SetPrivateKeyReadEnable_fips(1,
-                                                          _lib.WC_KEYTYPE_ALL);
+        ret = _lib.wolfCrypt_SetPrivateKeyReadEnable_fips(1, _lib.WC_KEYTYPE_ALL)
         if ret < 0:
             raise WolfCryptError("wolfCrypt_SetPrivateKeyReadEnable_fips failed"
                 " (%d)" % ret)