mirror of
https://github.com/coolsnowwolf/packages.git
synced 2025-05-01 10:31:21 +08:00
df7f208c40
Also add TAR_OPTIONS and TAR_CMD. Unfortunately, latest version of libsodium extracts to an additional libsodium-latest subfolder, which is unneccessary and removed by these options. Fixes: #827 Signed-off-by: Carsten Schuette <schuettecarsten@googlemail.com>
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
--- a/src/libsodium/Makefile.am
|
|
+++ b/src/libsodium/Makefile.am
|
|
@@ -73,6 +73,7 @@ libsodium_la_SOURCES = \
|
|
crypto_scalarmult/curve25519/ref10/x25519_ref10.h \
|
|
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 \
|
|
@@ -173,7 +174,6 @@ 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_scalarmult/ristretto255/ref10/scalarmult_ristretto255_ref10.c \
|
|
crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c \
|
|
crypto_shorthash/siphash24/shorthash_siphashx24.c \
|
|
--- a/src/libsodium/include/sodium.h
|
|
+++ b/src/libsodium/include/sodium.h
|
|
@@ -39,6 +39,7 @@
|
|
#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"
|
|
@@ -64,7 +65,6 @@
|
|
#include "sodium/crypto_core_ed25519.h"
|
|
#include "sodium/crypto_core_ristretto255.h"
|
|
#include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
|
|
-#include "sodium/crypto_scalarmult_ed25519.h"
|
|
#include "sodium/crypto_scalarmult_ristretto255.h"
|
|
#include "sodium/crypto_secretbox_xchacha20poly1305.h"
|
|
#include "sodium/crypto_stream_salsa2012.h"
|