From 972984880e191284f1bdb225c989239a9f2e7af0 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 20 Jan 2013 11:57:39 -0800 Subject: [PATCH] Fix double definition of ge25519_base in ed25519 --- src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c | 2 ++ src/libsodium/crypto_sign/ed25519/ref/ge25519.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c b/src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c index 125582aa..8783737d 100644 --- a/src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c +++ b/src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c @@ -6,6 +6,8 @@ #include "ge25519.h" +extern const ge25519 ge25519_base; + static void get_hram(unsigned char *hram, const unsigned char *sm, const unsigned char *pk, unsigned char *playground, unsigned long long smlen) { unsigned long long i; diff --git a/src/libsodium/crypto_sign/ed25519/ref/ge25519.h b/src/libsodium/crypto_sign/ed25519/ref/ge25519.h index 3820492b..f33426aa 100644 --- a/src/libsodium/crypto_sign/ed25519/ref/ge25519.h +++ b/src/libsodium/crypto_sign/ed25519/ref/ge25519.h @@ -20,8 +20,6 @@ typedef struct fe25519 t; } ge25519; -const ge25519 ge25519_base; - int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]); void ge25519_pack(unsigned char r[32], const ge25519 *p);