commit 73eb3a9d2240517d95e9abb4fa9e9d4066a5f330
author Adam Langley <agl@google.com> Tue May 02 14:47:40 2017 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue May 02 22:11:50 2017 +0000
tree e3a3213fb3c57e60bf32e6a63bf6e0bde7e1b445
parent 6dd055d2eb39fe66e4b66bcb58eaa5692113caa0

Undefine some macros in bn/

I forgot to scrub these files when they moved and their macros are
currently leaking into other files. This isn't a problem, but does
prevent ec/ code from being moved into the module at the moment.

Change-Id: I5433fb043e90a03ae3dc5c38cb3a69563aada007
Reviewed-on: https://boringssl-review.googlesource.com/15845
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/fipsmodule/bn/asm/x86_64-gcc.c

diff --git a/crypto/fipsmodule/bn/asm/x86_64-gcc.c b/crypto/fipsmodule/bn/asm/x86_64-gcc.c
index 7b6fc20..72e7689 100644
--- a/crypto/fipsmodule/bn/asm/x86_64-gcc.c
+++ b/crypto/fipsmodule/bn/asm/x86_64-gcc.c
@@ -531,4 +531,12 @@
   r[7] = c2;
 }
 
+#undef mul_add
+#undef mul
+#undef sqr
+#undef mul_add_c
+#undef sqr_add_c
+#undef mul_add_c2
+#undef sqr_add_c2
+
 #endif  /* !NO_ASM && X86_64 && __GNUC__ */

crypto/fipsmodule/bn/generic.c

diff --git a/crypto/fipsmodule/bn/generic.c b/crypto/fipsmodule/bn/generic.c
index de77cc5..3d98689 100644
--- a/crypto/fipsmodule/bn/generic.c
+++ b/crypto/fipsmodule/bn/generic.c
@@ -704,4 +704,12 @@
   r[7] = c2;
 }
 
+#undef mul_add
+#undef mul
+#undef sqr
+#undef mul_add_c
+#undef mul_add_c2
+#undef sqr_add_c
+#undef sqr_add_c2
+
 #endif