From 1dca7edfabb5537b2545a800acedfc7972997d73 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 14 Jul 2014 18:43:46 -0700 Subject: [PATCH] --enable-minimal should compile only what is required for the high-level API This doesn't include aes128ctr. --- configure.ac | 2 +- src/libsodium/Makefile.am | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index eb78472e..773c0d33 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ AC_ARG_ENABLE(blocking-random, AC_ARG_ENABLE(minimal, [AS_HELP_STRING(--enable-minimal, - [Do not compile salsa208, salsa2012, edwards25519sha512batch and aes256estream])], + [Only compile the minimum set of functions required for the high-level API])], [ AS_IF([test "x$enableval" = "xyes"], [ enable_minimal="yes" diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index fd2c4f25..4c6260a3 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -131,19 +131,6 @@ libsodium_la_SOURCES = \ crypto_sign/ed25519/ref10/sign.c \ crypto_sign/ed25519/ref10/sqrtm1.h \ crypto_stream/crypto_stream.c \ - crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \ - crypto_stream/aes128ctr/stream_aes128ctr_api.c \ - crypto_stream/aes128ctr/portable/api.h \ - crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c \ - crypto_stream/aes128ctr/portable/common.h \ - crypto_stream/aes128ctr/portable/common_aes128ctr.c \ - crypto_stream/aes128ctr/portable/consts.h \ - crypto_stream/aes128ctr/portable/consts_aes128ctr.c \ - crypto_stream/aes128ctr/portable/int128.h \ - crypto_stream/aes128ctr/portable/int128_aes128ctr.c \ - crypto_stream/aes128ctr/portable/stream_aes128ctr.c \ - crypto_stream/aes128ctr/portable/types.h \ - crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \ crypto_stream/chacha20/stream_chacha20_api.c \ crypto_stream/chacha20/ref/api.h \ crypto_stream/chacha20/ref/stream_chacha20_ref.c \ @@ -224,6 +211,19 @@ libsodium_la_SOURCES += \ crypto_sign/edwards25519sha512batch/ref/sc25519.h \ crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c \ crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \ + crypto_stream/aes128ctr/portable/afternm_aes128ctr.c \ + crypto_stream/aes128ctr/stream_aes128ctr_api.c \ + crypto_stream/aes128ctr/portable/api.h \ + crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c \ + crypto_stream/aes128ctr/portable/common.h \ + crypto_stream/aes128ctr/portable/common_aes128ctr.c \ + crypto_stream/aes128ctr/portable/consts.h \ + crypto_stream/aes128ctr/portable/consts_aes128ctr.c \ + crypto_stream/aes128ctr/portable/int128.h \ + crypto_stream/aes128ctr/portable/int128_aes128ctr.c \ + crypto_stream/aes128ctr/portable/stream_aes128ctr.c \ + crypto_stream/aes128ctr/portable/types.h \ + crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c \ crypto_stream/aes256estream/hongjun/aes-table.h \ crypto_stream/aes256estream/hongjun/aes-table-be.h \ crypto_stream/aes256estream/hongjun/aes-table-le.h \