From 195df905247d6fea9954df782097791d1e94748b Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 19 Apr 2013 14:46:15 +0200 Subject: [PATCH] Avoid duplicate crypto_scalarmult.h --- src/libsodium/Makefile.am | 2 +- .../curve25519/ref/{crypto_scalarmult.h => api.h} | 0 .../crypto_scalarmult/curve25519/ref/base_curve25519_ref.c | 2 +- .../crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/libsodium/crypto_scalarmult/curve25519/ref/{crypto_scalarmult.h => api.h} (100%) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index fb96157d..2b613fdc 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -17,8 +17,8 @@ libsodium_la_SOURCES = \ crypto_generichash/blake2/ref/blake2b-ref.c \ crypto_generichash/blake2/ref/blake2s-ref.c \ crypto_generichash/blake2/ref/generichash_blake2b.c \ + crypto_scalarmult/curve25519/ref/api.h \ crypto_scalarmult/curve25519/ref/base_curve25519_ref.c \ - crypto_scalarmult/curve25519/ref/crypto_scalarmult.h \ crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c \ crypto_hashblocks/sha256/ref/blocks_sha256.c \ crypto_hashblocks/sha256/ref/api.h \ diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h b/src/libsodium/crypto_scalarmult/curve25519/ref/api.h similarity index 100% rename from src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h rename to src/libsodium/crypto_scalarmult/curve25519/ref/api.h diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c b/src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c index ac2d7eb4..b83e4c25 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c +++ b/src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c @@ -5,7 +5,7 @@ Public domain. Derived from public domain code by D. J. Bernstein. */ -#include "crypto_scalarmult.h" +#include "api.h" const unsigned char base[32] = {9}; diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c b/src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c index 6a479558..e4e9669a 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c +++ b/src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c @@ -5,7 +5,7 @@ Public domain. Derived from public domain code by D. J. Bernstein. */ -#include "crypto_scalarmult.h" +#include "api.h" static void add(unsigned int out[32],const unsigned int a[32],const unsigned int b[32]) {