summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-15 15:55:36 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-15 15:55:36 -0500
commitb90f9ebbb2e985ddc9b644404b862376d72e16d3 (patch)
tree31172041ce9096c0a10f458ec0856762931d7328
parent5d400b5f7f604e62265a74dd9d3442780cfe1f0f (diff)
parent4beee0f69ba65690755e486648d901f716cfd0ee (diff)
downloadtor-b90f9ebbb2e985ddc9b644404b862376d72e16d3.tar.gz
tor-b90f9ebbb2e985ddc9b644404b862376d72e16d3.zip
Merge remote-tracking branch 'public/integers_donna'
-rw-r--r--changes/integers_donna3
-rw-r--r--src/ext/curve25519_donna/curve25519-donna-c64.c4
-rw-r--r--src/ext/curve25519_donna/curve25519-donna.c4
3 files changed, 9 insertions, 2 deletions
diff --git a/changes/integers_donna b/changes/integers_donna
new file mode 100644
index 0000000000..e9c69e8e1c
--- /dev/null
+++ b/changes/integers_donna
@@ -0,0 +1,3 @@
+ o Minor bugfixes (portability)
+ - Tweak the curve25519-donna*.c implementations to tolerate systems
+ that lack stdint.h. Fixes bug 3894; bugfix on 0.2.4.8-alpha.
diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c
index 9ebd8a12d8..b68ff3695a 100644
--- a/src/ext/curve25519_donna/curve25519-donna-c64.c
+++ b/src/ext/curve25519_donna/curve25519-donna-c64.c
@@ -22,8 +22,10 @@
* from the sample implementation.
*/
+#include "orconfig.h"
+
#include <string.h>
-#include <stdint.h>
+#include "torint.h"
typedef uint8_t u8;
typedef uint64_t limb;
diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c
index 80e4594eec..5c6821ccd8 100644
--- a/src/ext/curve25519_donna/curve25519-donna.c
+++ b/src/ext/curve25519_donna/curve25519-donna.c
@@ -46,8 +46,10 @@
* from the sample implementation.
*/
+#include "orconfig.h"
+
#include <string.h>
-#include <stdint.h>
+#include "torint.h"
typedef uint8_t u8;
typedef int32_t s32;