001-revert-f5076db5f8ef27.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536
  1. --- a/src/libsodium/Makefile.am
  2. +++ b/src/libsodium/Makefile.am
  3. @@ -59,6 +59,7 @@ libsodium_la_SOURCES = \
  4. crypto_scalarmult/curve25519/ref10/x25519_ref10.h \
  5. crypto_scalarmult/curve25519/scalarmult_curve25519.c \
  6. crypto_scalarmult/curve25519/scalarmult_curve25519.h \
  7. + crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c \
  8. crypto_secretbox/crypto_secretbox.c \
  9. crypto_secretbox/crypto_secretbox_easy.c \
  10. crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \
  11. @@ -160,7 +161,6 @@ libsodium_la_SOURCES += \
  12. crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h \
  13. crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c \
  14. crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c \
  15. - crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c \
  16. crypto_scalarmult/ristretto255/ref10/scalarmult_ristretto255_ref10.c \
  17. crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c \
  18. crypto_shorthash/siphash24/shorthash_siphashx24.c \
  19. --- a/src/libsodium/include/sodium.h
  20. +++ b/src/libsodium/include/sodium.h
  21. @@ -33,6 +33,7 @@
  22. #include "sodium/crypto_pwhash_argon2i.h"
  23. #include "sodium/crypto_scalarmult.h"
  24. #include "sodium/crypto_scalarmult_curve25519.h"
  25. +#include "sodium/crypto_scalarmult_ed25519.h"
  26. #include "sodium/crypto_secretbox.h"
  27. #include "sodium/crypto_secretbox_xsalsa20poly1305.h"
  28. #include "sodium/crypto_secretstream_xchacha20poly1305.h"
  29. @@ -57,7 +58,6 @@
  30. # include "sodium/crypto_box_curve25519xchacha20poly1305.h"
  31. # include "sodium/crypto_core_ed25519.h"
  32. # include "sodium/crypto_core_ristretto255.h"
  33. -# include "sodium/crypto_scalarmult_ed25519.h"
  34. # include "sodium/crypto_scalarmult_ristretto255.h"
  35. # include "sodium/crypto_secretbox_xchacha20poly1305.h"
  36. # include "sodium/crypto_pwhash_scryptsalsa208sha256.h"