{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752658317, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"098bb18819c6f51f10a514282ba88a2d", "commit": {"type":"commit", "time": 1519131570, "time_ofs": 0, "oid_tree": { "oid": "42cc29f9e8df7f95b01998eed8034623bb2d8d0b", "alias": []}, "oid":{ "oid": "68b20c00659c16b65ae2fcfc120e1407a68de04f", "alias": []}, "msg": "More style fixes to Curve448 code based on review feedback", "sig_commit": { "git_time": { "time": 1519131570, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }, "sig_author": { "git_time": { "time": 1518445622, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }}, "body": "More style fixes to Curve448 code based on review feedback\n\nReviewed-by: Bernd Edlinger \u003cbernd.edlinger@hotmail.de\u003e\n(Merged from https://github.com/openssl/openssl/pull/5105)\n" , "diff": "diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h\nindex 1f5d2d7..48081c7 100644\n--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h\n+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h\n@@ -10,10 +10,10 @@\n * Originally written by Mike Hamburg\n */\n \n-#include \u0022internal/constant_time_locl.h\u0022\n+#ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H\n+# define HEADER_ARCH_32_ARCH_INTRINSICS_H\n \n-#ifndef __ARCH_ARCH_32_ARCH_INTRINSICS_H__\n-# define __ARCH_ARCH_32_ARCH_INTRINSICS_H__\n+#include \u0022internal/constant_time_locl.h\u0022\n \n # define ARCH_WORD_BITS 32\n \n@@ -24,4 +24,4 @@ static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)\n return ((uint64_t)a) * b;\n }\n \n-#endif /* __ARCH_ARCH_32_ARCH_INTRINSICS_H__ */\n+#endif /* HEADER_ARCH_32_ARCH_INTRINSICS_H */\ndiff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h\nindex 7c87e97..217f994 100644\n--- a/crypto/ec/curve448/arch_32/f_impl.h\n+++ b/crypto/ec/curve448/arch_32/f_impl.h\n@@ -9,12 +9,16 @@\n *\n * Originally written by Mike Hamburg\n */\n-#define GF_HEADROOM 2\n-#define LIMB(x) (x)\u0026((1\u003c\u003c28)-1), (x)\u003e\u003e28\n-#define FIELD_LITERAL(a,b,c,d,e,f,g,h) \u005c\n+\n+#ifndef HEADER_ARCH_32_F_IMPL_H\n+# define HEADER_ARCH_32_F_IMPL_H\n+\n+# define GF_HEADROOM 2\n+# define LIMB(x) (x)\u0026((1\u003c\u003c28)-1), (x)\u003e\u003e28\n+# define FIELD_LITERAL(a,b,c,d,e,f,g,h) \u005c\n {{LIMB(a),LIMB(b),LIMB(c),LIMB(d),LIMB(e),LIMB(f),LIMB(g),LIMB(h)}}\n \n-#define LIMB_PLACE_VALUE(i) 28\n+# define LIMB_PLACE_VALUE(i) 28\n \n void gf_add_RAW(gf out, const gf a, const gf b)\n {\n@@ -54,3 +58,5 @@ void gf_weak_reduce(gf a)\n a-\u003elimb[i] \u003d (a-\u003elimb[i] \u0026 mask) + (a-\u003elimb[i - 1] \u003e\u003e 28);\n a-\u003elimb[0] \u003d (a-\u003elimb[0] \u0026 mask) + tmp;\n }\n+\n+#endif /* HEADER_ARCH_32_F_IMPL_H */\ndiff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c\nindex bfeaf51..eb8752d 100644\n--- a/crypto/ec/curve448/curve448.c\n+++ b/crypto/ec/curve448/curve448.c\n@@ -167,6 +167,7 @@ static void sub_niels_from_pt(curve448_point_t d, const niels_t e,\n int before_double)\n {\n gf a, b, c;\n+\n gf_sub_nr(b, d-\u003ey, d-\u003ex); /* 3+e */\n gf_mul(a, e-\u003eb, b);\n gf_add_nr(b, d-\u003ex, d-\u003ey); /* 2+e */\n@@ -207,9 +208,9 @@ c448_bool_t curve448_point_eq(const curve448_point_t p,\n const curve448_point_t q)\n {\n mask_t succ;\n+ gf a, b;\n \n /* equality mod 2-torsion compares x/y */\n- gf a, b;\n gf_mul(a, p-\u003ey, q-\u003ex);\n gf_mul(b, q-\u003ey, p-\u003ex);\n succ \u003d gf_eq(a, b);\n@@ -220,8 +221,8 @@ c448_bool_t curve448_point_eq(const curve448_point_t p,\n c448_bool_t curve448_point_valid(const curve448_point_t p)\n {\n mask_t out;\n-\n gf a, b, c;\n+\n gf_mul(a, p-\u003ex, p-\u003ey);\n gf_mul(b, p-\u003ez, p-\u003et);\n out \u003d gf_eq(a, b);\n@@ -248,17 +249,16 @@ void curve448_precomputed_scalarmul(curve448_point_t out,\n const curve448_precomputed_s * table,\n const curve448_scalar_t scalar)\n {\n- int i;\n- unsigned j, k;\n+ unsigned int i, j, k;\n const unsigned int n \u003d COMBS_N, t \u003d COMBS_T, s \u003d COMBS_S;\n niels_t ni;\n-\n curve448_scalar_t scalar1x;\n+\n curve448_scalar_add(scalar1x, scalar, precomputed_scalarmul_adjustment);\n curve448_scalar_halve(scalar1x, scalar1x);\n \n- for (i \u003d s - 1; i \u003e\u003d 0; i--) {\n- if (i !\u003d (int)s - 1)\n+ for (i \u003d s; i \u003e 0; i--) {\n+ if (i !\u003d s)\n point_double_internal(out, out, 0);\n \n for (j \u003d 0; j \u003c n; j++) {\n@@ -266,7 +266,8 @@ void curve448_precomputed_scalarmul(curve448_point_t out,\n mask_t invert;\n \n for (k \u003d 0; k \u003c t; k++) {\n- unsigned int bit \u003d i + s * (k + j * t);\n+ unsigned int bit \u003d (i - 1) + s * (k + j * t);\n+\n if (bit \u003c C448_SCALAR_BITS) {\n tab |\u003d\n (scalar1x-\u003elimb[bit / WBITS] \u003e\u003e (bit % WBITS) \u0026 1) \u003c\u003c k;\n@@ -281,8 +282,8 @@ void curve448_precomputed_scalarmul(curve448_point_t out,\n 1 \u003c\u003c (t - 1), tab);\n \n cond_neg_niels(ni, invert);\n- if ((i !\u003d (int)s - 1) || j) {\n- add_niels_to_pt(out, ni, j \u003d\u003d n - 1 \u0026\u0026 i);\n+ if ((i !\u003d s) || j !\u003d 0) {\n+ add_niels_to_pt(out, ni, j \u003d\u003d n - 1 \u0026\u0026 i !\u003d 1);\n } else {\n niels_to_pt(out, ni);\n }\n@@ -297,10 +298,10 @@ void curve448_point_mul_by_ratio_and_encode_like_eddsa(\n uint8_t enc[EDDSA_448_PUBLIC_BYTES],\n const curve448_point_t p)\n {\n-\n- /* The point is now on the twisted curve. Move it to untwisted. */\n gf x, y, z, t;\n curve448_point_t q;\n+\n+ /* The point is now on the twisted curve. Move it to untwisted. */\n curve448_point_copy(q, p);\n \n {\n@@ -354,9 +355,7 @@ c448_error_t curve448_point_decode_like_eddsa_and_mul_by_ratio(\n enc2[EDDSA_448_PRIVATE_BYTES - 1] \u0026\u003d ~0x80;\n \n succ \u003d gf_deserialize(p-\u003ey, enc2, 1, 0);\n-#if 0 \u003d\u003d 0\n succ \u0026\u003d word_is_zero(enc2[EDDSA_448_PRIVATE_BYTES - 1]);\n-#endif\n \n gf_sqr(p-\u003ex, p-\u003ey);\n gf_sub(p-\u003ez, ONE, p-\u003ex); /* num \u003d 1-y^2 */\n@@ -371,8 +370,9 @@ c448_error_t curve448_point_decode_like_eddsa_and_mul_by_ratio(\n gf_copy(p-\u003ez, ONE);\n \n {\n- /* 4-isogeny 2xy/(y^2-ax^2), (y^2+ax^2)/(2-y^2-ax^2) */\n gf a, b, c, d;\n+\n+ /* 4-isogeny 2xy/(y^2-ax^2), (y^2+ax^2)/(2-y^2-ax^2) */\n gf_sqr(c, p-\u003ex);\n gf_sqr(a, p-\u003ey);\n gf_add(d, c, a);\n@@ -478,6 +478,7 @@ void curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t\n const curve448_point_t p)\n {\n curve448_point_t q;\n+\n curve448_point_copy(q, p);\n gf_invert(q-\u003et, q-\u003ex, 0); /* 1/x */\n gf_mul(q-\u003ez, q-\u003et, q-\u003ey); /* y/x */\n@@ -523,7 +524,7 @@ struct smvt_control {\n # define NUMTRAILINGZEROS\tnumtrailingzeros\n static uint32_t numtrailingzeros(uint32_t i)\n {\n- unsigned int tmp;\n+ uint32_t tmp;\n uint32_t num \u003d 31;\n \n if (i \u003d\u003d 0)\n@@ -549,7 +550,8 @@ static uint32_t numtrailingzeros(uint32_t i)\n i \u003d tmp;\n num -\u003d 2;\n }\n- if ((i \u003c\u003c 1) !\u003d 0)\n+ tmp \u003d i \u003c\u003c 1;\n+ if (tmp !\u003d 0)\n num--;\n \n return num;\n@@ -593,7 +595,7 @@ static int recode_wnaf(struct smvt_control *control,\n int32_t delta \u003d odd \u0026 mask;\n \n assert(position \u003e\u003d 0);\n- if (odd \u0026 1 \u003c\u003c (table_bits + 1))\n+ if (odd \u0026 (1 \u003c\u003c (table_bits + 1)))\n delta -\u003d (1 \u003c\u003c (table_bits + 1));\n current -\u003d delta \u003c\u003c pos;\n control[position].power \u003d pos + 16 * (w - 1);\n@@ -606,9 +608,9 @@ static int recode_wnaf(struct smvt_control *control,\n \n position++;\n n \u003d table_size - position;\n- for (i \u003d 0; i \u003c n; i++) {\n+ for (i \u003d 0; i \u003c n; i++)\n control[i] \u003d control[i + position];\n- }\n+\n return n - 1;\n }\n \n@@ -649,8 +651,8 @@ void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,\n const curve448_point_t base2,\n const curve448_scalar_t scalar2)\n {\n- const int table_bits_var \u003d C448_WNAF_VAR_TABLE_BITS,\n- table_bits_pre \u003d C448_WNAF_FIXED_TABLE_BITS;\n+ const int table_bits_var \u003d C448_WNAF_VAR_TABLE_BITS;\n+ const int table_bits_pre \u003d C448_WNAF_FIXED_TABLE_BITS;\n struct smvt_control control_var[C448_SCALAR_BITS /\n (C448_WNAF_VAR_TABLE_BITS + 1) + 3];\n struct smvt_control control_pre[C448_SCALAR_BITS /\n@@ -682,37 +684,36 @@ void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,\n }\n \n for (i--; i \u003e\u003d 0; i--) {\n- int cv \u003d (i \u003d\u003d control_var[contv].power), cp \u003d\n- (i \u003d\u003d control_pre[contp].power);\n+ int cv \u003d (i \u003d\u003d control_var[contv].power);\n+ int cp \u003d (i \u003d\u003d control_pre[contp].power);\n+\n point_double_internal(combo, combo, i \u0026\u0026 !(cv || cp));\n \n if (cv) {\n assert(control_var[contv].addend);\n \n- if (control_var[contv].addend \u003e 0) {\n+ if (control_var[contv].addend \u003e 0)\n add_pniels_to_pt(combo,\n precmp_var[control_var[contv].addend \u003e\u003e 1],\n i \u0026\u0026 !cp);\n- } else {\n+ else\n sub_pniels_from_pt(combo,\n precmp_var[(-control_var[contv].addend)\n \u003e\u003e 1], i \u0026\u0026 !cp);\n- }\n contv++;\n }\n \n if (cp) {\n assert(control_pre[contp].addend);\n \n- if (control_pre[contp].addend \u003e 0) {\n+ if (control_pre[contp].addend \u003e 0)\n add_niels_to_pt(combo,\n curve448_wnaf_base[control_pre[contp].addend\n \u003e\u003e 1], i);\n- } else {\n+ else\n sub_niels_from_pt(combo,\n curve448_wnaf_base[(-control_pre\n [contp].addend) \u003e\u003e 1], i);\n- }\n contp++;\n }\n }\ndiff --git a/crypto/ec/curve448/curve448_lcl.h b/crypto/ec/curve448/curve448_lcl.h\nindex 8513d93..2bc3bd8 100644\n--- a/crypto/ec/curve448/curve448_lcl.h\n+++ b/crypto/ec/curve448/curve448_lcl.h\n@@ -6,7 +6,9 @@\n * in the file LICENSE in the source distribution or at\n * https://www.openssl.org/source/license.html\n */\n-#include \u0022curve448utils.h\u0022\n+#ifndef HEADER_CURVE448_LCL_H\n+# define HEADER_CURVE448_LCL_H\n+# include \u0022curve448utils.h\u0022\n \n int X448(uint8_t out_shared_key[56], const uint8_t private_key[56],\n const uint8_t peer_public_value[56]);\n@@ -32,3 +34,5 @@ int ED448ph_verify(const uint8_t hash[64], const uint8_t signature[114],\n \n int ED448_public_from_private(uint8_t out_public_key[57],\n const uint8_t private_key[57]);\n+\n+#endif /* HEADER_CURVE448_LCL_H */\ndiff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h\nindex 2243889..95b8c26 100644\n--- a/crypto/ec/curve448/curve448utils.h\n+++ b/crypto/ec/curve448/curve448utils.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef __C448_COMMON_H__\n-# define __C448_COMMON_H__ 1\n+#ifndef HEADER_CURVE448UTILS_H\n+# define HEADER_CURVE448UTILS_H\n \n # include \u003copenssl/e_os2.h\u003e\n \n@@ -58,10 +58,10 @@ typedef int64_t c448_dsword_t;\n # endif\n \n /* C448_TRUE \u003d -1 so that C448_TRUE \u0026 x \u003d x */\n-static const c448_bool_t C448_TRUE \u003d 0 - (c448_bool_t)1;\n+# define C448_TRUE (0 - (c448_bool_t)1)\n \n /* C448_FALSE \u003d 0 so that C448_FALSE \u0026 x \u003d 0 */\n-static const c448_bool_t C448_FALSE \u003d 0;\n+# define C448_FALSE 0\n \n /* Another boolean type used to indicate success or failure. */\n typedef enum {\ndiff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h\nindex eec6629..87c1aed 100644\n--- a/crypto/ec/curve448/ed448.h\n+++ b/crypto/ec/curve448/ed448.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef __C448_ED448_H__\n-# define __C448_ED448_H__ 1\n+#ifndef HEADER_ED448_H\n+# define HEADER_ED448_H\n \n # include \u0022point_448.h\u0022\n \n@@ -108,8 +108,7 @@ c448_error_t c448_ed448_sign_prehash(\n *\n * For Ed25519, it is unsafe to use the same key for both prehashed and\n * non-prehashed messages, at least without some very careful protocol-level\n- * disambiguation. For Ed448 it is safe. The C++ wrapper is designed to make\n- * it harder to screw this up, but this C code gives you no seat belt.\n+ * disambiguation. For Ed448 it is safe.\n */\n c448_error_t c448_ed448_verify(const uint8_t\n signature[EDDSA_448_SIGNATURE_BYTES],\n@@ -196,4 +195,4 @@ c448_error_t c448_ed448_convert_private_key_to_x448(\n uint8_t x[X448_PRIVATE_BYTES],\n const uint8_t ed[EDDSA_448_PRIVATE_BYTES]);\n \n-#endif /* __C448_ED448_H__ */\n+#endif /* HEADER_ED448_H */\ndiff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c\nindex aac8a9e..556edf0 100644\n--- a/crypto/ec/curve448/eddsa.c\n+++ b/crypto/ec/curve448/eddsa.c\n@@ -169,7 +169,7 @@ c448_error_t c448_ed448_sign(\n expanded + EDDSA_448_PRIVATE_BYTES,\n EDDSA_448_PRIVATE_BYTES)\n || !EVP_DigestUpdate(hashctx, message, message_len)) {\n- OPENSSL_cleanse(expanded, sizeof(expanded));\n+ OPENSSL_cleanse(expanded, sizeof(expanded));\n goto err;\n }\n OPENSSL_cleanse(expanded, sizeof(expanded));\n@@ -191,9 +191,8 @@ c448_error_t c448_ed448_sign(\n curve448_point_t p;\n \n curve448_scalar_halve(nonce_scalar_2, nonce_scalar);\n- for (c \u003d 2; c \u003c C448_EDDSA_ENCODE_RATIO; c \u003c\u003c\u003d 1) {\n+ for (c \u003d 2; c \u003c C448_EDDSA_ENCODE_RATIO; c \u003c\u003c\u003d 1)\n curve448_scalar_halve(nonce_scalar_2, nonce_scalar_2);\n- }\n \n curve448_precomputed_scalarmul(p, curve448_precomputed_base,\n nonce_scalar_2);\n@@ -207,10 +206,10 @@ c448_error_t c448_ed448_sign(\n \n /* Compute the challenge */\n if (!hash_init_with_dom(hashctx, prehashed, 0, context, context_len)\n- || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))\n- || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)\n- || !EVP_DigestUpdate(hashctx, message, message_len)\n- || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))\n+ || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))\n+ || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)\n+ || !EVP_DigestUpdate(hashctx, message, message_len)\n+ || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))\n goto err;\n \n curve448_scalar_decode_long(challenge_scalar, challenge,\n@@ -313,12 +312,8 @@ c448_error_t c448_ed448_verify_prehash(\n const uint8_t hash[64], const uint8_t *context,\n uint8_t context_len)\n {\n- c448_error_t ret;\n-\n- ret \u003d c448_ed448_verify(signature, pubkey, hash, 64, 1, context,\n- context_len);\n-\n- return ret;\n+ return c448_ed448_verify(signature, pubkey, hash, 64, 1, context,\n+ context_len);\n }\n \n int ED448_sign(uint8_t *out_sig, const uint8_t *message, size_t message_len,\ndiff --git a/crypto/ec/curve448/f_generic.c b/crypto/ec/curve448/f_generic.c\nindex 81c7576..341eb3f 100644\n--- a/crypto/ec/curve448/f_generic.c\n+++ b/crypto/ec/curve448/f_generic.c\n@@ -46,6 +46,7 @@ void gf_serialize(uint8_t serial[SER_BYTES], const gf x, int with_hibit)\n mask_t gf_hibit(const gf x)\n {\n gf y;\n+\n gf_add(y, x, x);\n gf_strong_reduce(y);\n return 0 - (y-\u003elimb[0] \u0026 1);\n@@ -55,6 +56,7 @@ mask_t gf_hibit(const gf x)\n mask_t gf_lobit(const gf x)\n {\n gf y;\n+\n gf_copy(y, x);\n gf_strong_reduce(y);\n return 0 - (y-\u003elimb[0] \u0026 1);\n@@ -168,6 +170,7 @@ mask_t gf_eq(const gf a, const gf b)\n mask_t gf_isr(gf a, const gf x)\n {\n gf L0, L1, L2;\n+\n gf_sqr(L1, x);\n gf_mul(L2, x, L1);\n gf_sqr(L1, L2);\ndiff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h\nindex 5bc16bc..18d91f3 100644\n--- a/crypto/ec/curve448/field.h\n+++ b/crypto/ec/curve448/field.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef __GF_H__\n-# define __GF_H__\n+#ifndef HEADER_FIELD_H\n+# define HEADER_FIELD_H\n \n # include \u0022internal/constant_time_locl.h\u0022\n # include \u003cstring.h\u003e\n@@ -23,7 +23,7 @@\n # define SER_BYTES 56\n \n # if defined(__GNUC__) || defined(__clang__)\n-# define INLINE_UNUSED __inline__ __attribute__((unused,always_inline))\n+# define INLINE_UNUSED __inline__ __attribute__((__unused__,__always_inline__))\n # define RESTRICT __restrict__\n # define ALIGNED __attribute__((aligned(32)))\n # else\n@@ -169,4 +169,4 @@ static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)\n }\n }\n \n-#endif /* __GF_H__ */\n+#endif /* HEADER_FIELD_H */\ndiff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h\nindex 90a7c3b..33e4001 100644\n--- a/crypto/ec/curve448/point_448.h\n+++ b/crypto/ec/curve448/point_448.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef __C448_POINT_448_H__\n-# define __C448_POINT_448_H__ 1\n+#ifndef HEADER_POINT_448_H\n+# define HEADER_POINT_448_H\n \n # include \u0022curve448utils.h\u0022\n # include \u0022field.h\u0022\n@@ -280,4 +280,4 @@ void curve448_scalar_destroy(curve448_scalar_t scalar);\n /* Overwrite point with zeros. */\n void curve448_point_destroy(curve448_point_t point);\n \n-#endif /* __C448_POINT_448_H__ */\n+#endif /* HEADER_POINT_448_H */\ndiff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h\nindex a180850..ff85c4c 100644\n--- a/crypto/ec/curve448/word.h\n+++ b/crypto/ec/curve448/word.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef __WORD_H__\n-# define __WORD_H__\n+#ifndef HEADER_WORD_H\n+# define HEADER_WORD_H\n \n # include \u003cstring.h\u003e\n \n@@ -168,4 +168,4 @@ static ossl_inline void ignore_result(c448_bool_t boo)\n (void)boo;\n }\n \n-#endif /* __WORD_H__ */\n+#endif /* HEADER_WORD_H */\ndiff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c\nindex f01d81b..aac4818 100644\n--- a/test/curve448_internal_test.c\n+++ b/test/curve448_internal_test.c\n@@ -587,8 +587,8 @@ static const uint8_t *dohash(EVP_MD_CTX *hashctx, const uint8_t *msg,\n static uint8_t hashout[64];\n \n if (!EVP_DigestInit_ex(hashctx, EVP_shake256(), NULL)\n- || !EVP_DigestUpdate(hashctx, msg, msglen)\n- || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))\n+ || !EVP_DigestUpdate(hashctx, msg, msglen)\n+ || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))\n return NULL;\n \n return hashout;\n","s":{"c":1752658317,"u": 38736}} ],"g": 42030,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}