From f5076db5f8ef2799bd049677b4b4020286efe397 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 23 Oct 2017 16:12:06 +0200 Subject: [PATCH] Do not include scalarmult_ed25519 in minimal builds --- src/libsodium/Makefile.am | 2 +- src/libsodium/include/sodium.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 46099637..18c3e4b7 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -59,7 +59,6 @@ libsodium_la_SOURCES = \ crypto_scalarmult/crypto_scalarmult.c \ crypto_scalarmult/curve25519/scalarmult_curve25519.c \ crypto_scalarmult/curve25519/scalarmult_curve25519.h \ - crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c \ crypto_secretbox/crypto_secretbox.c \ crypto_secretbox/crypto_secretbox_easy.c \ crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \ @@ -166,6 +165,7 @@ libsodium_la_SOURCES += \ crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h \ crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c \ crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c \ + crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c \ crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c \ crypto_shorthash/siphash24/shorthash_siphashx24.c \ crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c \ diff --git a/src/libsodium/include/sodium.h b/src/libsodium/include/sodium.h index 183c2224..77f1f11f 100644 --- a/src/libsodium/include/sodium.h +++ b/src/libsodium/include/sodium.h @@ -33,7 +33,6 @@ #include "sodium/crypto_pwhash_argon2i.h" #include "sodium/crypto_scalarmult.h" #include "sodium/crypto_scalarmult_curve25519.h" -#include "sodium/crypto_scalarmult_ed25519.h" #include "sodium/crypto_secretbox.h" #include "sodium/crypto_secretbox_xsalsa20poly1305.h" #include "sodium/crypto_secretstream_xchacha20poly1305.h" @@ -59,6 +58,7 @@ #ifndef SODIUM_LIBRARY_MINIMAL # include "sodium/crypto_box_curve25519xchacha20poly1305.h" +# include "sodium/crypto_scalarmult_ed25519.h" # include "sodium/crypto_secretbox_xchacha20poly1305.h" # include "sodium/crypto_pwhash_scryptsalsa208sha256.h" # include "sodium/crypto_stream_salsa2012.h"