Merge pull request #117 from roberthdevries/simplify-feature-enable-variable-string

Simplify generating feature enabled variables using an f-string.

Author: dgarske

scripts/build_ffi.py

@@ -458,45 +458,45 @@ def build_ffi(local_wolfssl, features):
         #include <wolfssl/wolfcrypt/dilithium.h>
     """
 
-    init_source_string = """
+    init_source_string = f"""
         #ifdef __cplusplus
-        extern "C" {
+        extern "C" {{
         #endif
-           """ + includes_string + """
+        {includes_string}
         #ifdef __cplusplus
-        }
+        }}
         #endif
 
-        int ERROR_STRINGS_ENABLED = """ + str(features["ERROR_STRINGS"]) + """;
-        int MPAPI_ENABLED = """ + str(features["MPAPI"]) + """;
-        int SHA_ENABLED = """ + str(features["SHA"]) + """;
-        int SHA256_ENABLED = """ + str(features["SHA256"]) + """;
-        int SHA384_ENABLED = """ + str(features["SHA384"]) + """;
-        int SHA512_ENABLED = """ + str(features["SHA512"]) + """;
-        int SHA3_ENABLED = """ + str(features["SHA3"]) + """;
-        int DES3_ENABLED = """ + str(features["DES3"]) + """;
-        int AES_ENABLED = """ + str(features["AES"]) + """;
-        int AES_SIV_ENABLED = """ + str(features["AES_SIV"]) + """;
-        int CHACHA_ENABLED = """ + str(features["CHACHA"]) + """;
-        int HMAC_ENABLED = """ + str(features["HMAC"]) + """;
-        int RSA_ENABLED = """ + str(features["RSA"]) + """;
-        int RSA_BLINDING_ENABLED = """ + str(features["RSA_BLINDING"]) + """;
-        int ECC_TIMING_RESISTANCE_ENABLED = """ + str(features["ECC_TIMING_RESISTANCE"]) + """;
-        int ECC_ENABLED = """ + str(features["ECC"]) + """;
-        int ED25519_ENABLED = """ + str(features["ED25519"]) + """;
-        int ED448_ENABLED = """ + str(features["ED448"]) + """;
-        int KEYGEN_ENABLED = """ + str(features["KEYGEN"]) + """;
-        int PWDBASED_ENABLED = """ + str(features["PWDBASED"]) + """;
-        int FIPS_ENABLED = """ + str(features["FIPS"]) + """;
-        int FIPS_VERSION = """ + str(features["FIPS_VERSION"]) + """;
-        int ASN_ENABLED = """ + str(features["ASN"]) + """;
-        int WC_RNG_SEED_CB_ENABLED = """ + str(features["WC_RNG_SEED_CB"]) + """;
-        int AESGCM_STREAM_ENABLED = """ + str(features["AESGCM_STREAM"]) + """;
-        int RSA_PSS_ENABLED = """ + str(features["RSA_PSS"]) + """;
-        int CHACHA20_POLY1305_ENABLED = """ + str(features["CHACHA20_POLY1305"]) + """;
-        int ML_KEM_ENABLED = """ + str(features["ML_KEM"]) + """;
-        int ML_DSA_ENABLED = """ + str(features["ML_DSA"]) + """;
-        int HKDF_ENABLED = """ + str(features["HKDF"]) + """;
+        int ERROR_STRINGS_ENABLED = {features["ERROR_STRINGS"]};
+        int MPAPI_ENABLED = {features["MPAPI"]};
+        int SHA_ENABLED = {features["SHA"]};
+        int SHA256_ENABLED = {features["SHA256"]};
+        int SHA384_ENABLED = {features["SHA384"]};
+        int SHA512_ENABLED = {features["SHA512"]};
+        int SHA3_ENABLED = {features["SHA3"]};
+        int DES3_ENABLED = {features["DES3"]};
+        int AES_ENABLED = {features["AES"]};
+        int AES_SIV_ENABLED = {features["AES_SIV"]};
+        int CHACHA_ENABLED = {features["CHACHA"]};
+        int HMAC_ENABLED = {features["HMAC"]};
+        int RSA_ENABLED = {features["RSA"]};
+        int RSA_BLINDING_ENABLED = {features["RSA_BLINDING"]};
+        int ECC_TIMING_RESISTANCE_ENABLED = {features["ECC_TIMING_RESISTANCE"]};
+        int ECC_ENABLED = {features["ECC"]};
+        int ED25519_ENABLED = {features["ED25519"]};
+        int ED448_ENABLED = {features["ED448"]};
+        int KEYGEN_ENABLED = {features["KEYGEN"]};
+        int PWDBASED_ENABLED = {features["PWDBASED"]};
+        int FIPS_ENABLED = {features["FIPS"]};
+        int FIPS_VERSION = {features["FIPS_VERSION"]};
+        int ASN_ENABLED = {features["ASN"]};
+        int WC_RNG_SEED_CB_ENABLED = {features["WC_RNG_SEED_CB"]};
+        int AESGCM_STREAM_ENABLED = {features["AESGCM_STREAM"]};
+        int RSA_PSS_ENABLED = {features["RSA_PSS"]};
+        int CHACHA20_POLY1305_ENABLED = {features["CHACHA20_POLY1305"]};
+        int ML_KEM_ENABLED = {features["ML_KEM"]};
+        int ML_DSA_ENABLED = {features["ML_DSA"]};
+        int HKDF_ENABLED = {features["HKDF"]};
     """
 
     ffibuilder.set_source( "wolfcrypt._ffi", init_source_string,