Commit e4c2e4cb authored Oct 02, 2017 by Bernd Edlinger

Fix the return type of felem_is_zero_int which should be int.


Change argument type of xxxelem_is_zero_int to const void*
to avoid the need of type casts.

Fixes #4413

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4450)

(cherry picked from commit c55b786a)

parent f9cbf470

crypto/ec/ecp_nistp224.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -716,7 +716,7 @@ static limb felem_is_zero(const felem in)
		return (zero \| two224m96p1 \| two225m97p2);
		}

		static limb felem_is_zero_int(const felem in)
		static int felem_is_zero_int(const void *in)
		{
		return (int)(felem_is_zero(in) & ((limb) 1));
		}
		@@ -1391,7 +1391,6 @@ static void make_points_affine(size_t num, felem points[ /* num */ ][3],
		sizeof(felem),
		tmp_felems,
		(void ()(void ))felem_one,
		(int ()(const void ))
		felem_is_zero_int,
		(void ()(void , const void *))
		felem_assign,

crypto/ec/ecp_nistp256.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -977,7 +977,7 @@ static limb smallfelem_is_zero(const smallfelem small)
		return result;
		}

		static int smallfelem_is_zero_int(const smallfelem small)
		static int smallfelem_is_zero_int(const void *small)
		{
		return (int)(smallfelem_is_zero(small) & ((limb) 1));
		}
		@@ -1979,7 +1979,6 @@ static void make_points_affine(size_t num, smallfelem points[][3],
		sizeof(smallfelem),
		tmp_smallfelems,
		(void ()(void ))smallfelem_one,
		(int ()(const void ))
		smallfelem_is_zero_int,
		(void ()(void , const void *))
		smallfelem_assign,

crypto/ec/ecp_nistp521.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -871,7 +871,7 @@ static limb felem_is_zero(const felem in)
		return is_zero;
		}

		static int felem_is_zero_int(const felem in)
		static int felem_is_zero_int(const void *in)
		{
		return (int)(felem_is_zero(in) & ((limb) 1));
		}
		@@ -1787,7 +1787,6 @@ static void make_points_affine(size_t num, felem points[][3],
		sizeof(felem),
		tmp_felems,
		(void ()(void ))felem_one,
		(int ()(const void ))
		felem_is_zero_int,
		(void ()(void , const void *))
		felem_assign,