[30773] in CVS-changelog-for-Kerberos-V5
krb5 commit: Make fiat 128-bit typedefs work with older gcc
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Mar 26 18:27:37 2020
Date: Thu, 26 Mar 2020 18:27:24 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <202003262227.02QMROuw026004@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/dd5d6e5e39be6cf7fe9d54a79e824f8cb7301177
commit dd5d6e5e39be6cf7fe9d54a79e824f8cb7301177
Author: Greg Hudson <ghudson@mit.edu>
Date: Tue Mar 24 02:00:25 2020 -0400
Make fiat 128-bit typedefs work with older gcc
Use the int128_t and uint128_t types defined by edwards25519.c, rather
than [un]signed __int128 which does not compile with gcc 4.4.
Reported by Norm Green.
ticket: 8888
tags: pullup
target_version: 1.18-next
target_version: 1.17-next
src/plugins/preauth/spake/edwards25519.c | 4 +++-
src/plugins/preauth/spake/edwards25519_fiat.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/preauth/spake/edwards25519.c b/src/plugins/preauth/spake/edwards25519.c
index cbc26e5..2039411 100644
--- a/src/plugins/preauth/spake/edwards25519.c
+++ b/src/plugins/preauth/spake/edwards25519.c
@@ -68,7 +68,9 @@
* generation. The fiat_25519_selectznz and fiat_25519_carry_scmul_121666
* functions were removed from both branches as they are not used here (the
* former because it is not used by the BoringSSL code and the latter because
- * it is only used by the X25519 code).
+ * it is only used by the X25519 code). The fiat_25519_int128 and
+ * fiat_25519_uint128 typedefs were adjusted to work with older versions of
+ * gcc.
*
* - fe_cmov() has the initial "Silence an unused function warning" part
* removed, as we removed fiat_25519_selectznz instead.
diff --git a/src/plugins/preauth/spake/edwards25519_fiat.h b/src/plugins/preauth/spake/edwards25519_fiat.h
index b61cb49..48ade92 100644
--- a/src/plugins/preauth/spake/edwards25519_fiat.h
+++ b/src/plugins/preauth/spake/edwards25519_fiat.h
@@ -11,8 +11,8 @@
#include <stdint.h>
typedef unsigned char fiat_25519_uint1;
typedef signed char fiat_25519_int1;
-typedef signed __int128 fiat_25519_int128;
-typedef unsigned __int128 fiat_25519_uint128;
+typedef int128_t fiat_25519_int128;
+typedef uint128_t fiat_25519_uint128;
/*
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
