From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 4 Sep 2015 13:30:59 +0000 (-0400)
Subject: Fix an alignment issue in our extensions to ed25519_donna
X-Git-Tag: tor-0.2.7.3-rc~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81e3deeb54d2f3d022655c6a51f966ef44bf6fb3;p=thirdparty%2Ftor.git

Fix an alignment issue in our extensions to ed25519_donna

Apparently this only happens with clang (or with some particular
clang versions), and only on i386.

Fixes 16970; bug not in any released Tor.

Found by Teor; fix from Yawning.
---

diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c
index 7f5894da79..12493f7d14 100644
--- a/src/ext/ed25519/donna/ed25519_tor.c
+++ b/src/ext/ed25519/donna/ed25519_tor.c
@@ -323,7 +323,7 @@ int
 ed25519_donna_pubkey_from_curve25519_pubkey(unsigned char *out,
   const unsigned char *inp, int signbit)
 {
-  static const bignum25519 one = { 1 };
+  static const bignum25519 ALIGN(16) one = { 1 };
   bignum25519 ALIGN(16) u, uminus1, uplus1, inv_uplus1, y;
 
   /* Prop228: y = (u-1)/(u+1) */