7 files changed, 668 insertions, 674 deletions
diff --git a/libs/libsodium/src/crypto_sign/crypto_sign.c b/libs/libsodium/src/crypto_sign/crypto_sign.c
index 127072f726..7064ac5718 100644
--- a/libs/libsodium/src/crypto_sign/crypto_sign.c
+++ b/libs/libsodium/src/crypto_sign/crypto_sign.c
@@ -1,115 +1,115 @@
-
-#include "crypto_sign.h"
-
-size_t
-crypto_sign_statebytes(void)
-{
-    return sizeof(crypto_sign_state);
-}
-
-size_t
-crypto_sign_bytes(void)
-{
-    return crypto_sign_BYTES;
-}
-
-size_t
-crypto_sign_seedbytes(void)
-{
-    return crypto_sign_SEEDBYTES;
-}
-
-size_t
-crypto_sign_publickeybytes(void)
-{
-    return crypto_sign_PUBLICKEYBYTES;
-}
-
-size_t
-crypto_sign_secretkeybytes(void)
-{
-    return crypto_sign_SECRETKEYBYTES;
-}
-
-size_t
-crypto_sign_messagebytes_max(void)
-{
-    return crypto_sign_MESSAGEBYTES_MAX;
-}
-
-const char *
-crypto_sign_primitive(void)
-{
-    return crypto_sign_PRIMITIVE;
-}
-
-int
-crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                         const unsigned char *seed)
-{
-    return crypto_sign_ed25519_seed_keypair(pk, sk, seed);
-}
-
-int
-crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-{
-    return crypto_sign_ed25519_keypair(pk, sk);
-}
-
-int
-crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-            const unsigned char *m, unsigned long long mlen,
-            const unsigned char *sk)
-{
-    return crypto_sign_ed25519(sm, smlen_p, m, mlen, sk);
-}
-
-int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                 const unsigned char *sm, unsigned long long smlen,
-                 const unsigned char *pk)
-{
-    return crypto_sign_ed25519_open(m, mlen_p, sm, smlen, pk);
-}
-
-int
-crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                     const unsigned char *m, unsigned long long mlen,
-                     const unsigned char *sk)
-{
-    return crypto_sign_ed25519_detached(sig, siglen_p, m, mlen, sk);
-}
-
-int
-crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *pk)
-{
-    return crypto_sign_ed25519_verify_detached(sig, m, mlen, pk);
-}
-
-int
-crypto_sign_init(crypto_sign_state *state)
-{
-    return crypto_sign_ed25519ph_init(state);
-}
-
-int
-crypto_sign_update(crypto_sign_state *state, const unsigned char *m,
-                   unsigned long long mlen)
-{
-    return crypto_sign_ed25519ph_update(state, m, mlen);
-}
-
-int
-crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                         unsigned long long *siglen_p, const unsigned char *sk)
-{
-    return crypto_sign_ed25519ph_final_create(state, sig, siglen_p, sk);
-}
-
-int
-crypto_sign_final_verify(crypto_sign_state *state, unsigned char *sig,
-                         const unsigned char *pk)
-{
-    return crypto_sign_ed25519ph_final_verify(state, sig, pk);
-}
+
+#include "crypto_sign.h"
+
+size_t
+crypto_sign_statebytes(void)
+{
+    return sizeof(crypto_sign_state);
+}
+
+size_t
+crypto_sign_bytes(void)
+{
+    return crypto_sign_BYTES;
+}
+
+size_t
+crypto_sign_seedbytes(void)
+{
+    return crypto_sign_SEEDBYTES;
+}
+
+size_t
+crypto_sign_publickeybytes(void)
+{
+    return crypto_sign_PUBLICKEYBYTES;
+}
+
+size_t
+crypto_sign_secretkeybytes(void)
+{
+    return crypto_sign_SECRETKEYBYTES;
+}
+
+size_t
+crypto_sign_messagebytes_max(void)
+{
+    return crypto_sign_MESSAGEBYTES_MAX;
+}
+
+const char *
+crypto_sign_primitive(void)
+{
+    return crypto_sign_PRIMITIVE;
+}
+
+int
+crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
+                         const unsigned char *seed)
+{
+    return crypto_sign_ed25519_seed_keypair(pk, sk, seed);
+}
+
+int
+crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
+{
+    return crypto_sign_ed25519_keypair(pk, sk);
+}
+
+int
+crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
+            const unsigned char *m, unsigned long long mlen,
+            const unsigned char *sk)
+{
+    return crypto_sign_ed25519(sm, smlen_p, m, mlen, sk);
+}
+
+int
+crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
+                 const unsigned char *sm, unsigned long long smlen,
+                 const unsigned char *pk)
+{
+    return crypto_sign_ed25519_open(m, mlen_p, sm, smlen, pk);
+}
+
+int
+crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
+                     const unsigned char *m, unsigned long long mlen,
+                     const unsigned char *sk)
+{
+    return crypto_sign_ed25519_detached(sig, siglen_p, m, mlen, sk);
+}
+
+int
+crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
+                            unsigned long long mlen, const unsigned char *pk)
+{
+    return crypto_sign_ed25519_verify_detached(sig, m, mlen, pk);
+}
+
+int
+crypto_sign_init(crypto_sign_state *state)
+{
+    return crypto_sign_ed25519ph_init(state);
+}
+
+int
+crypto_sign_update(crypto_sign_state *state, const unsigned char *m,
+                   unsigned long long mlen)
+{
+    return crypto_sign_ed25519ph_update(state, m, mlen);
+}
+
+int
+crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
+                         unsigned long long *siglen_p, const unsigned char *sk)
+{
+    return crypto_sign_ed25519ph_final_create(state, sig, siglen_p, sk);
+}
+
+int
+crypto_sign_final_verify(crypto_sign_state *state, const unsigned char *sig,
+                         const unsigned char *pk)
+{
+    return crypto_sign_ed25519ph_final_verify(state, sig, pk);
+}
diff --git a/libs/libsodium/src/crypto_sign/ed25519/ref10/keypair.c b/libs/libsodium/src/crypto_sign/ed25519/ref10/keypair.c
index 4b9bf0dc8c..5d0e6a0006 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/ref10/keypair.c
+++ b/libs/libsodium/src/crypto_sign/ed25519/ref10/keypair.c
@@ -1,91 +1,83 @@
-
-#include <string.h>
-
-#include "crypto_hash_sha512.h"
-#include "crypto_scalarmult_curve25519.h"
-#include "crypto_sign_ed25519.h"
-#include "sign_ed25519_ref10.h"
-#include "private/ed25519_ref10.h"
-#include "randombytes.h"
-#include "utils.h"
-
-int
-crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                 const unsigned char *seed)
-{
-    ge25519_p3 A;
-
-#ifdef ED25519_NONDETERMINISTIC
-    memmove(sk, seed, 32);
-#else
-    crypto_hash_sha512(sk, seed, 32);
-#endif
-    sk[0] &= 248;
-    sk[31] &= 127;
-    sk[31] |= 64;
-
-    ge25519_scalarmult_base(&A, sk);
-    ge25519_p3_tobytes(pk, &A);
-
-    memmove(sk, seed, 32);
-    memmove(sk + 32, pk, 32);
-
-    return 0;
-}
-
-int
-crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-{
-    unsigned char seed[32];
-    int           ret;
-
-    randombytes_buf(seed, sizeof seed);
-    ret = crypto_sign_ed25519_seed_keypair(pk, sk, seed);
-    sodium_memzero(seed, sizeof seed);
-
-    return ret;
-}
-
-int
-crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                     const unsigned char *ed25519_pk)
-{
-    ge25519_p3 A;
-    fe25519    x;
-    fe25519    one_minus_y;
-
-    if (ge25519_has_small_order(ed25519_pk) != 0 ||
-        ge25519_frombytes_negate_vartime(&A, ed25519_pk) != 0 ||
-        ge25519_is_on_main_subgroup(&A) == 0) {
-        return -1;
-    }
-    fe25519_1(one_minus_y);
-    fe25519_sub(one_minus_y, one_minus_y, A.Y);
-    fe25519_1(x);
-    fe25519_add(x, x, A.Y);
-    fe25519_invert(one_minus_y, one_minus_y);
-    fe25519_mul(x, x, one_minus_y);
-    fe25519_tobytes(curve25519_pk, x);
-
-    return 0;
-}
-
-int
-crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                     const unsigned char *ed25519_sk)
-{
-    unsigned char h[crypto_hash_sha512_BYTES];
-
-#ifdef ED25519_NONDETERMINISTIC
-    memcpy(h, ed25519_sk, 32);
-#else
-    crypto_hash_sha512(h, ed25519_sk, 32);
-#endif
-    h[0] &= 248;
-    h[31] &= 127;
-    h[31] |= 64;
-    memcpy(curve25519_sk, h, crypto_scalarmult_curve25519_BYTES);
-    sodium_memzero(h, sizeof h);
-
-    return 0;
-}
+
+#include <string.h>
+
+#include "crypto_hash_sha512.h"
+#include "crypto_scalarmult_curve25519.h"
+#include "crypto_sign_ed25519.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
+#include "randombytes.h"
+#include "utils.h"
+
+int
+crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
+                                 const unsigned char *seed)
+{
+    ge25519_p3 A;
+
+    crypto_hash_sha512(sk, seed, 32);
+    sk[0] &= 248;
+    sk[31] &= 127;
+    sk[31] |= 64;
+
+    ge25519_scalarmult_base(&A, sk);
+    ge25519_p3_tobytes(pk, &A);
+
+    memmove(sk, seed, 32);
+    memmove(sk + 32, pk, 32);
+
+    return 0;
+}
+
+int
+crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
+{
+    unsigned char seed[32];
+    int           ret;
+
+    randombytes_buf(seed, sizeof seed);
+    ret = crypto_sign_ed25519_seed_keypair(pk, sk, seed);
+    sodium_memzero(seed, sizeof seed);
+
+    return ret;
+}
+
+int
+crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
+                                     const unsigned char *ed25519_pk)
+{
+    ge25519_p3 A;
+    fe25519    x;
+    fe25519    one_minus_y;
+
+    if (ge25519_has_small_order(ed25519_pk) != 0 ||
+        ge25519_frombytes_negate_vartime(&A, ed25519_pk) != 0 ||
+        ge25519_is_on_main_subgroup(&A) == 0) {
+        return -1;
+    }
+    fe25519_1(one_minus_y);
+    fe25519_sub(one_minus_y, one_minus_y, A.Y);
+    fe25519_1(x);
+    fe25519_add(x, x, A.Y);
+    fe25519_invert(one_minus_y, one_minus_y);
+    fe25519_mul(x, x, one_minus_y);
+    fe25519_tobytes(curve25519_pk, x);
+
+    return 0;
+}
+
+int
+crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
+                                     const unsigned char *ed25519_sk)
+{
+    unsigned char h[crypto_hash_sha512_BYTES];
+
+    crypto_hash_sha512(h, ed25519_sk, 32);
+    h[0] &= 248;
+    h[31] &= 127;
+    h[31] |= 64;
+    memcpy(curve25519_sk, h, crypto_scalarmult_curve25519_BYTES);
+    sodium_memzero(h, sizeof h);
+
+    return 0;
+}
diff --git a/libs/libsodium/src/crypto_sign/ed25519/ref10/obsolete.c b/libs/libsodium/src/crypto_sign/ed25519/ref10/obsolete.c
index 03440cfa75..f0d53b7335 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/ref10/obsolete.c
+++ b/libs/libsodium/src/crypto_sign/ed25519/ref10/obsolete.c
@@ -1,116 +1,116 @@
-
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "crypto_hash_sha512.h"
-#include "crypto_sign_edwards25519sha512batch.h"
-#include "crypto_verify_32.h"
-#include "private/ed25519_ref10.h"
-#include "randombytes.h"
-#include "utils.h"
-
-int
-crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                            unsigned char *sk)
-{
-    ge25519_p3 A;
-
-    randombytes_buf(sk, 32);
-    crypto_hash_sha512(sk, sk, 32);
-    sk[0] &= 248;
-    sk[31] &= 127;
-    sk[31] |= 64;
-    ge25519_scalarmult_base(&A, sk);
-    ge25519_p3_tobytes(pk, &A);
-
-    return 0;
-}
-
-int
-crypto_sign_edwards25519sha512batch(unsigned char       *sm,
-                                    unsigned long long  *smlen_p,
-                                    const unsigned char *m,
-                                    unsigned long long   mlen,
-                                    const unsigned char *sk)
-{
-    crypto_hash_sha512_state hs;
-    unsigned char            nonce[64];
-    unsigned char            hram[64];
-    unsigned char            sig[64];
-    ge25519_p3               A;
-    ge25519_p3               R;
-
-    crypto_hash_sha512_init(&hs);
-    crypto_hash_sha512_update(&hs, sk + 32, 32);
-    crypto_hash_sha512_update(&hs, m, mlen);
-    crypto_hash_sha512_final(&hs, nonce);
-    ge25519_scalarmult_base(&A, sk);
-    ge25519_p3_tobytes(sig + 32, &A);
-    sc25519_reduce(nonce);
-    ge25519_scalarmult_base(&R, nonce);
-    ge25519_p3_tobytes(sig, &R);
-    crypto_hash_sha512_init(&hs);
-    crypto_hash_sha512_update(&hs, sig, 32);
-    crypto_hash_sha512_update(&hs, m, mlen);
-    crypto_hash_sha512_final(&hs, hram);
-    sc25519_reduce(hram);
-    sc25519_muladd(sig + 32, hram, nonce, sk);
-    sodium_memzero(hram, sizeof hram);
-    memmove(sm + 32, m, (size_t) mlen);
-    memcpy(sm, sig, 32);
-    memcpy(sm + 32 + mlen, sig + 32, 32);
-    *smlen_p = mlen + 64U;
-
-    return 0;
-}
-
-int
-crypto_sign_edwards25519sha512batch_open(unsigned char       *m,
-                                         unsigned long long  *mlen_p,
-                                         const unsigned char *sm,
-                                         unsigned long long   smlen,
-                                         const unsigned char *pk)
-{
-    unsigned char      h[64];
-    unsigned char      t1[32], t2[32];
-    unsigned long long mlen;
-    ge25519_cached     Ai;
-    ge25519_p1p1       csa;
-    ge25519_p2         cs;
-    ge25519_p3         A;
-    ge25519_p3         R;
-    ge25519_p3         cs3;
-
-    *mlen_p = 0;
-    if (smlen < 64 || smlen - 64 > crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX) {
-        return -1;
-    }
-    mlen = smlen - 64;
-    if (sm[smlen - 1] & 224) {
-        return -1;
-    }
-    if (ge25519_has_small_order(pk) != 0 ||
-        ge25519_frombytes_negate_vartime(&A, pk) != 0 ||
-        ge25519_has_small_order(sm) != 0 ||
-        ge25519_frombytes_negate_vartime(&R, sm) != 0) {
-        return -1;
-    }
-    ge25519_p3_to_cached(&Ai, &A);
-    crypto_hash_sha512(h, sm, mlen + 32);
-    sc25519_reduce(h);
-    ge25519_scalarmult(&cs3, h, &R);
-    ge25519_add(&csa, &cs3, &Ai);
-    ge25519_p1p1_to_p2(&cs, &csa);
-    ge25519_tobytes(t1, &cs);
-    t1[31] ^= 1 << 7;
-    ge25519_scalarmult_base(&R, sm + 32 + mlen);
-    ge25519_p3_tobytes(t2, &R);
-    if (crypto_verify_32(t1, t2) != 0) {
-        return -1;
-    }
-    *mlen_p = mlen;
-    memmove(m, sm + 32, mlen);
-
-    return 0;
-}
+
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "crypto_hash_sha512.h"
+#include "crypto_sign_edwards25519sha512batch.h"
+#include "crypto_verify_32.h"
+#include "private/ed25519_ref10.h"
+#include "randombytes.h"
+#include "utils.h"
+
+int
+crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
+                                            unsigned char *sk)
+{
+    ge25519_p3 A;
+
+    randombytes_buf(sk, 32);
+    crypto_hash_sha512(sk, sk, 32);
+    sk[0] &= 248;
+    sk[31] &= 127;
+    sk[31] |= 64;
+    ge25519_scalarmult_base(&A, sk);
+    ge25519_p3_tobytes(pk, &A);
+
+    return 0;
+}
+
+int
+crypto_sign_edwards25519sha512batch(unsigned char       *sm,
+                                    unsigned long long  *smlen_p,
+                                    const unsigned char *m,
+                                    unsigned long long   mlen,
+                                    const unsigned char *sk)
+{
+    crypto_hash_sha512_state hs;
+    unsigned char            nonce[64];
+    unsigned char            hram[64];
+    unsigned char            sig[64];
+    ge25519_p3               A;
+    ge25519_p3               R;
+
+    crypto_hash_sha512_init(&hs);
+    crypto_hash_sha512_update(&hs, sk + 32, 32);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, nonce);
+    ge25519_scalarmult_base(&A, sk);
+    ge25519_p3_tobytes(sig + 32, &A);
+    sc25519_reduce(nonce);
+    ge25519_scalarmult_base(&R, nonce);
+    ge25519_p3_tobytes(sig, &R);
+    crypto_hash_sha512_init(&hs);
+    crypto_hash_sha512_update(&hs, sig, 32);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, hram);
+    sc25519_reduce(hram);
+    sc25519_muladd(sig + 32, hram, nonce, sk);
+    sodium_memzero(hram, sizeof hram);
+    memmove(sm + 32, m, (size_t) mlen);
+    memcpy(sm, sig, 32);
+    memcpy(sm + 32 + mlen, sig + 32, 32);
+    *smlen_p = mlen + 64U;
+
+    return 0;
+}
+
+int
+crypto_sign_edwards25519sha512batch_open(unsigned char       *m,
+                                         unsigned long long  *mlen_p,
+                                         const unsigned char *sm,
+                                         unsigned long long   smlen,
+                                         const unsigned char *pk)
+{
+    unsigned char      h[64];
+    unsigned char      t1[32], t2[32];
+    unsigned long long mlen;
+    ge25519_cached     Ai;
+    ge25519_p1p1       csa;
+    ge25519_p2         cs;
+    ge25519_p3         A;
+    ge25519_p3         R;
+    ge25519_p3         cs3;
+
+    *mlen_p = 0;
+    if (smlen < 64 || smlen - 64 > crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX) {
+        return -1;
+    }
+    mlen = smlen - 64;
+    if (sm[smlen - 1] & 224) {
+        return -1;
+    }
+    if (ge25519_has_small_order(pk) != 0 ||
+        ge25519_frombytes_negate_vartime(&A, pk) != 0 ||
+        ge25519_has_small_order(sm) != 0 ||
+        ge25519_frombytes_negate_vartime(&R, sm) != 0) {
+        return -1;
+    }
+    ge25519_p3_to_cached(&Ai, &A);
+    crypto_hash_sha512(h, sm, mlen + 32);
+    sc25519_reduce(h);
+    ge25519_scalarmult(&cs3, h, &R);
+    ge25519_add(&csa, &cs3, &Ai);
+    ge25519_p1p1_to_p2(&cs, &csa);
+    ge25519_tobytes(t1, &cs);
+    t1[31] ^= 1 << 7;
+    ge25519_scalarmult_base(&R, sm + 32 + mlen);
+    ge25519_p3_tobytes(t2, &R);
+    if (crypto_verify_32(t1, t2) != 0) {
+        return -1;
+    }
+    *mlen_p = mlen;
+    memmove(m, sm + 32, mlen);
+
+    return 0;
+}
diff --git a/libs/libsodium/src/crypto_sign/ed25519/ref10/open.c b/libs/libsodium/src/crypto_sign/ed25519/ref10/open.c
index aafecf64a1..d4b3f26980 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/ref10/open.c
+++ b/libs/libsodium/src/crypto_sign/ed25519/ref10/open.c
@@ -1,93 +1,96 @@
-
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "crypto_hash_sha512.h"
-#include "crypto_sign_ed25519.h"
-#include "crypto_verify_32.h"
-#include "sign_ed25519_ref10.h"
-#include "private/ed25519_ref10.h"
-#include "utils.h"
-
-int
-_crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                     const unsigned char *m,
-                                     unsigned long long   mlen,
-                                     const unsigned char *pk,
-                                     int prehashed)
-{
-    crypto_hash_sha512_state hs;
-    unsigned char            h[64];
-    unsigned char            rcheck[32];
-    ge25519_p3               A;
-    ge25519_p2               R;
-
-#ifdef ED25519_COMPAT
-    if (sig[63] & 224) {
-        return -1;
-    }
-#else
-    if (sc25519_is_canonical(sig + 32) == 0 ||
-        ge25519_has_small_order(sig) != 0) {
-        return -1;
-    }
-    if (ge25519_is_canonical(pk) == 0 ||
-        ge25519_has_small_order(pk) != 0) {
-        return -1;
-    }
-#endif
-    if (ge25519_frombytes_negate_vartime(&A, pk) != 0) {
-        return -1;
-    }
-    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
-    crypto_hash_sha512_update(&hs, sig, 32);
-    crypto_hash_sha512_update(&hs, pk, 32);
-    crypto_hash_sha512_update(&hs, m, mlen);
-    crypto_hash_sha512_final(&hs, h);
-    sc25519_reduce(h);
-
-    ge25519_double_scalarmult_vartime(&R, h, &A, sig + 32);
-    ge25519_tobytes(rcheck, &R);
-
-    return crypto_verify_32(rcheck, sig) | (-(rcheck == sig)) |
-           sodium_memcmp(sig, rcheck, 32);
-}
-
-int
-crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                    const unsigned char *m,
-                                    unsigned long long   mlen,
-                                    const unsigned char *pk)
-{
-    return _crypto_sign_ed25519_verify_detached(sig, m, mlen, pk, 0);
-}
-
-int
-crypto_sign_ed25519_open(unsigned char *m, unsigned long long *mlen_p,
-                         const unsigned char *sm, unsigned long long smlen,
-                         const unsigned char *pk)
-{
-    unsigned long long mlen;
-
-    if (smlen < 64 || smlen - 64 > crypto_sign_ed25519_MESSAGEBYTES_MAX) {
-        goto badsig;
-    }
-    mlen = smlen - 64;
-    if (crypto_sign_ed25519_verify_detached(sm, sm + 64, mlen, pk) != 0) {
-        memset(m, 0, mlen);
-        goto badsig;
-    }
-    if (mlen_p != NULL) {
-        *mlen_p = mlen;
-    }
-    memmove(m, sm + 64, mlen);
-
-    return 0;
-
-badsig:
-    if (mlen_p != NULL) {
-        *mlen_p = 0;
-    }
-    return -1;
-}
+
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "crypto_hash_sha512.h"
+#include "crypto_sign_ed25519.h"
+#include "crypto_verify_32.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
+#include "utils.h"
+
+int
+_crypto_sign_ed25519_verify_detached(const unsigned char *sig,
+                                     const unsigned char *m,
+                                     unsigned long long   mlen,
+                                     const unsigned char *pk,
+                                     int prehashed)
+{
+    crypto_hash_sha512_state hs;
+    unsigned char            h[64];
+    unsigned char            rcheck[32];
+    ge25519_p3               A;
+    ge25519_p2               R;
+
+#ifdef ED25519_COMPAT
+    if (sig[63] & 224) {
+        return -1;
+    }
+#else
+    if (sc25519_is_canonical(sig + 32) == 0 ||
+        ge25519_has_small_order(sig) != 0) {
+        return -1;
+    }
+    if (ge25519_is_canonical(pk) == 0 ||
+        ge25519_has_small_order(pk) != 0) {
+        return -1;
+    }
+#endif
+    if (ge25519_frombytes_negate_vartime(&A, pk) != 0) {
+        return -1;
+    }
+    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
+    crypto_hash_sha512_update(&hs, sig, 32);
+    crypto_hash_sha512_update(&hs, pk, 32);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, h);
+    sc25519_reduce(h);
+
+    ge25519_double_scalarmult_vartime(&R, h, &A, sig + 32);
+    ge25519_tobytes(rcheck, &R);
+
+    return crypto_verify_32(rcheck, sig) | (-(rcheck == sig)) |
+           sodium_memcmp(sig, rcheck, 32);
+}
+
+int
+crypto_sign_ed25519_verify_detached(const unsigned char *sig,
+                                    const unsigned char *m,
+                                    unsigned long long   mlen,
+                                    const unsigned char *pk)
+{
+    return _crypto_sign_ed25519_verify_detached(sig, m, mlen, pk, 0);
+}
+
+int
+crypto_sign_ed25519_open(unsigned char *m, unsigned long long *mlen_p,
+                         const unsigned char *sm, unsigned long long smlen,
+                         const unsigned char *pk)
+{
+    unsigned long long mlen;
+
+    if (smlen < 64 || smlen - 64 > crypto_sign_ed25519_MESSAGEBYTES_MAX) {
+        goto badsig;
+    }
+    mlen = smlen - 64;
+    if (crypto_sign_ed25519_verify_detached(sm, sm + 64, mlen, pk) != 0) {
+        if (m != NULL) {
+            memset(m, 0, mlen);
+        }
+        goto badsig;
+    }
+    if (mlen_p != NULL) {
+        *mlen_p = mlen;
+    }
+    if (m != NULL) {
+        memmove(m, sm + 64, mlen);
+    }
+    return 0;
+
+badsig:
+    if (mlen_p != NULL) {
+        *mlen_p = 0;
+    }
+    return -1;
+}
diff --git a/libs/libsodium/src/crypto_sign/ed25519/ref10/sign.c b/libs/libsodium/src/crypto_sign/ed25519/ref10/sign.c
index 4df90bddd9..74a8100927 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/ref10/sign.c
+++ b/libs/libsodium/src/crypto_sign/ed25519/ref10/sign.c
@@ -1,144 +1,143 @@
-
-#include <string.h>
-
-#include "crypto_hash_sha512.h"
-#include "crypto_sign_ed25519.h"
-#include "sign_ed25519_ref10.h"
-#include "private/ed25519_ref10.h"
-#include "randombytes.h"
-#include "utils.h"
-
-void
-_crypto_sign_ed25519_ref10_hinit(crypto_hash_sha512_state *hs, int prehashed)
-{
-    static const unsigned char DOM2PREFIX[32 + 2] = {
-        'S', 'i', 'g', 'E', 'd', '2', '5', '5', '1', '9', ' ',
-        'n', 'o', ' ',
-        'E', 'd', '2', '5', '5', '1', '9', ' ',
-        'c', 'o', 'l', 'l', 'i', 's', 'i', 'o', 'n', 's', 1, 0
-    };
-
-    crypto_hash_sha512_init(hs);
-    if (prehashed) {
-        crypto_hash_sha512_update(hs, DOM2PREFIX, sizeof DOM2PREFIX);
-    }
-}
-
-static inline void
-_crypto_sign_ed25519_clamp(unsigned char k[32])
-{
-    k[0] &= 248;
-    k[31] &= 127;
-    k[31] |= 64;
-}
-
-#ifdef ED25519_NONDETERMINISTIC
-/* r = hash(B || empty_labelset || Z || pad1 || k || pad2 || empty_labelset || K || extra || M) (mod q) */
-static void
-_crypto_sign_ed25519_synthetic_r_hv(crypto_hash_sha512_state *hs,
-                                    unsigned char Z[32],
-                                    const unsigned char sk[64])
-{
-    static const unsigned char B[32] = {
-        0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-    };
-    static const unsigned char zeros[128] = { 0x00 };
-    static const unsigned char empty_labelset[3] = { 0x02, 0x00, 0x00 };
-
-    crypto_hash_sha512_update(hs, B, 32);
-    crypto_hash_sha512_update(hs, empty_labelset, 3);
-    randombytes_buf(Z, 32);
-    crypto_hash_sha512_update(hs, Z, 32);
-    crypto_hash_sha512_update(hs, zeros, 128 - (32 + 3 + 32) % 128);
-    crypto_hash_sha512_update(hs, sk, 32);
-    crypto_hash_sha512_update(hs, zeros, 128 - 32 % 128);
-    crypto_hash_sha512_update(hs, empty_labelset, 3);
-    crypto_hash_sha512_update(hs, sk + 32, 32);
-    /* empty extra */
-}
-#endif
-
-int
-_crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
-                              const unsigned char *m, unsigned long long mlen,
-                              const unsigned char *sk, int prehashed)
-{
-    crypto_hash_sha512_state hs;
-    unsigned char            az[64];
-    unsigned char            nonce[64];
-    unsigned char            hram[64];
-    ge25519_p3               R;
-
-    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
-
-#ifdef ED25519_NONDETERMINISTIC
-    memcpy(az, sk, 32);
-    _crypto_sign_ed25519_synthetic_r_hv(&hs, nonce, az);
-#else
-    crypto_hash_sha512(az, sk, 32);
-    crypto_hash_sha512_update(&hs, az + 32, 32);
-#endif
-
-    crypto_hash_sha512_update(&hs, m, mlen);
-    crypto_hash_sha512_final(&hs, nonce);
-
-    memmove(sig + 32, sk + 32, 32);
-
-    sc25519_reduce(nonce);
-    ge25519_scalarmult_base(&R, nonce);
-    ge25519_p3_tobytes(sig, &R);
-
-    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
-    crypto_hash_sha512_update(&hs, sig, 64);
-    crypto_hash_sha512_update(&hs, m, mlen);
-    crypto_hash_sha512_final(&hs, hram);
-
-    sc25519_reduce(hram);
-    _crypto_sign_ed25519_clamp(az);
-    sc25519_muladd(sig + 32, hram, az, nonce);
-
-    sodium_memzero(az, sizeof az);
-    sodium_memzero(nonce, sizeof nonce);
-
-    if (siglen_p != NULL) {
-        *siglen_p = 64U;
-    }
-    return 0;
-}
-
-int
-crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
-                             const unsigned char *m, unsigned long long mlen,
-                             const unsigned char *sk)
-{
-    return _crypto_sign_ed25519_detached(sig, siglen_p, m, mlen, sk, 0);
-}
-
-int
-crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                    const unsigned char *m, unsigned long long mlen,
-                    const unsigned char *sk)
-{
-    unsigned long long siglen;
-
-    memmove(sm + crypto_sign_ed25519_BYTES, m, mlen);
-    /* LCOV_EXCL_START */
-    if (crypto_sign_ed25519_detached(
-            sm, &siglen, sm + crypto_sign_ed25519_BYTES, mlen, sk) != 0 ||
-        siglen != crypto_sign_ed25519_BYTES) {
-        if (smlen_p != NULL) {
-            *smlen_p = 0;
-        }
-        memset(sm, 0, mlen + crypto_sign_ed25519_BYTES);
-        return -1;
-    }
-    /* LCOV_EXCL_STOP */
-
-    if (smlen_p != NULL) {
-        *smlen_p = mlen + siglen;
-    }
-    return 0;
-}
+
+#include <string.h>
+
+#include "crypto_hash_sha512.h"
+#include "crypto_sign_ed25519.h"
+#include "sign_ed25519_ref10.h"
+#include "private/ed25519_ref10.h"
+#include "randombytes.h"
+#include "utils.h"
+
+void
+_crypto_sign_ed25519_ref10_hinit(crypto_hash_sha512_state *hs, int prehashed)
+{
+    static const unsigned char DOM2PREFIX[32 + 2] = {
+        'S', 'i', 'g', 'E', 'd', '2', '5', '5', '1', '9', ' ',
+        'n', 'o', ' ',
+        'E', 'd', '2', '5', '5', '1', '9', ' ',
+        'c', 'o', 'l', 'l', 'i', 's', 'i', 'o', 'n', 's', 1, 0
+    };
+
+    crypto_hash_sha512_init(hs);
+    if (prehashed) {
+        crypto_hash_sha512_update(hs, DOM2PREFIX, sizeof DOM2PREFIX);
+    }
+}
+
+static inline void
+_crypto_sign_ed25519_clamp(unsigned char k[32])
+{
+    k[0] &= 248;
+    k[31] &= 127;
+    k[31] |= 64;
+}
+
+#ifdef ED25519_NONDETERMINISTIC
+/* r = hash(B || empty_labelset || Z || pad1 || k || pad2 || empty_labelset || K || extra || M) (mod q) */
+static void
+_crypto_sign_ed25519_synthetic_r_hv(crypto_hash_sha512_state *hs,
+                                    unsigned char Z[32],
+                                    const unsigned char sk[64])
+{
+    static const unsigned char B[32] = {
+        0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+    };
+    static const unsigned char zeros[128] = { 0x00 };
+    static const unsigned char empty_labelset[3] = { 0x02, 0x00, 0x00 };
+
+    crypto_hash_sha512_update(hs, B, 32);
+    crypto_hash_sha512_update(hs, empty_labelset, 3);
+    randombytes_buf(Z, 32);
+    crypto_hash_sha512_update(hs, Z, 32);
+    crypto_hash_sha512_update(hs, zeros, 128 - (32 + 3 + 32) % 128);
+    crypto_hash_sha512_update(hs, sk, 32);
+    crypto_hash_sha512_update(hs, zeros, 128 - 32 % 128);
+    crypto_hash_sha512_update(hs, empty_labelset, 3);
+    crypto_hash_sha512_update(hs, sk + 32, 32);
+    /* empty extra */
+}
+#endif
+
+int
+_crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
+                              const unsigned char *m, unsigned long long mlen,
+                              const unsigned char *sk, int prehashed)
+{
+    crypto_hash_sha512_state hs;
+    unsigned char            az[64];
+    unsigned char            nonce[64];
+    unsigned char            hram[64];
+    ge25519_p3               R;
+
+    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
+
+    crypto_hash_sha512(az, sk, 32);
+#ifdef ED25519_NONDETERMINISTIC
+    _crypto_sign_ed25519_synthetic_r_hv(&hs, nonce, az);
+#else
+    crypto_hash_sha512_update(&hs, az + 32, 32);
+#endif
+
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, nonce);
+
+    memmove(sig + 32, sk + 32, 32);
+
+    sc25519_reduce(nonce);
+    ge25519_scalarmult_base(&R, nonce);
+    ge25519_p3_tobytes(sig, &R);
+
+    _crypto_sign_ed25519_ref10_hinit(&hs, prehashed);
+    crypto_hash_sha512_update(&hs, sig, 64);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, hram);
+
+    sc25519_reduce(hram);
+    _crypto_sign_ed25519_clamp(az);
+    sc25519_muladd(sig + 32, hram, az, nonce);
+
+    sodium_memzero(az, sizeof az);
+    sodium_memzero(nonce, sizeof nonce);
+
+    if (siglen_p != NULL) {
+        *siglen_p = 64U;
+    }
+    return 0;
+}
+
+int
+crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
+                             const unsigned char *m, unsigned long long mlen,
+                             const unsigned char *sk)
+{
+    return _crypto_sign_ed25519_detached(sig, siglen_p, m, mlen, sk, 0);
+}
+
+int
+crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
+                    const unsigned char *m, unsigned long long mlen,
+                    const unsigned char *sk)
+{
+    unsigned long long siglen;
+
+    memmove(sm + crypto_sign_ed25519_BYTES, m, mlen);
+    /* LCOV_EXCL_START */
+    if (crypto_sign_ed25519_detached(
+            sm, &siglen, sm + crypto_sign_ed25519_BYTES, mlen, sk) != 0 ||
+        siglen != crypto_sign_ed25519_BYTES) {
+        if (smlen_p != NULL) {
+            *smlen_p = 0;
+        }
+        memset(sm, 0, mlen + crypto_sign_ed25519_BYTES);
+        return -1;
+    }
+    /* LCOV_EXCL_STOP */
+
+    if (smlen_p != NULL) {
+        *smlen_p = mlen + siglen;
+    }
+    return 0;
+}
diff --git a/libs/libsodium/src/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h b/libs/libsodium/src/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
index 29f45a8544..29db3269de 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
+++ b/libs/libsodium/src/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h
@@ -1,18 +1,18 @@
-#ifndef sign_ed25519_ref10_H
-#define sign_ed25519_ref10_H
-
-void _crypto_sign_ed25519_ref10_hinit(crypto_hash_sha512_state *hs,
-                                      int prehashed);
-
-int _crypto_sign_ed25519_detached(unsigned char *sig,
-                                  unsigned long long *siglen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *sk, int prehashed);
-
-int _crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                         const unsigned char *m,
-                                         unsigned long long   mlen,
-                                         const unsigned char *pk,
-                                         int prehashed);
-#endif
+#ifndef sign_ed25519_ref10_H
+#define sign_ed25519_ref10_H
+
+void _crypto_sign_ed25519_ref10_hinit(crypto_hash_sha512_state *hs,
+                                      int prehashed);
+
+int _crypto_sign_ed25519_detached(unsigned char *sig,
+                                  unsigned long long *siglen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *sk, int prehashed);
+
+int _crypto_sign_ed25519_verify_detached(const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long   mlen,
+                                         const unsigned char *pk,
+                                         int prehashed);
+#endif
diff --git a/libs/libsodium/src/crypto_sign/ed25519/sign_ed25519.c b/libs/libsodium/src/crypto_sign/ed25519/sign_ed25519.c
index 8a69513ede..2869c2c468 100644
--- a/libs/libsodium/src/crypto_sign/ed25519/sign_ed25519.c
+++ b/libs/libsodium/src/crypto_sign/ed25519/sign_ed25519.c
@@ -1,97 +1,97 @@
-
-#include <string.h>
-
-#include "crypto_hash_sha512.h"
-#include "crypto_sign_ed25519.h"
-#include "ref10/sign_ed25519_ref10.h"
-
-size_t
-crypto_sign_ed25519ph_statebytes(void)
-{
-    return sizeof(crypto_sign_ed25519ph_state);
-}
-
-size_t
-crypto_sign_ed25519_bytes(void)
-{
-    return crypto_sign_ed25519_BYTES;
-}
-
-size_t
-crypto_sign_ed25519_seedbytes(void)
-{
-    return crypto_sign_ed25519_SEEDBYTES;
-}
-
-size_t
-crypto_sign_ed25519_publickeybytes(void)
-{
-    return crypto_sign_ed25519_PUBLICKEYBYTES;
-}
-
-size_t
-crypto_sign_ed25519_secretkeybytes(void)
-{
-    return crypto_sign_ed25519_SECRETKEYBYTES;
-}
-
-size_t
-crypto_sign_ed25519_messagebytes_max(void)
-{
-    return crypto_sign_ed25519_MESSAGEBYTES_MAX;
-}
-
-int
-crypto_sign_ed25519_sk_to_seed(unsigned char *seed, const unsigned char *sk)
-{
-    memmove(seed, sk, crypto_sign_ed25519_SEEDBYTES);
-
-    return 0;
-}
-
-int
-crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-{
-    memmove(pk, sk + crypto_sign_ed25519_SEEDBYTES,
-            crypto_sign_ed25519_PUBLICKEYBYTES);
-    return 0;
-}
-
-int
-crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-{
-    crypto_hash_sha512_init(&state->hs);
-    return 0;
-}
-
-int
-crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                             const unsigned char *m, unsigned long long mlen)
-{
-    return crypto_hash_sha512_update(&state->hs, m, mlen);
-}
-
-int
-crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                   unsigned char               *sig,
-                                   unsigned long long          *siglen_p,
-                                   const unsigned char         *sk)
-{
-    unsigned char ph[crypto_hash_sha512_BYTES];
-
-    crypto_hash_sha512_final(&state->hs, ph);
-
-    return _crypto_sign_ed25519_detached(sig, siglen_p, ph, sizeof ph, sk, 1);
-}
-
-int
-crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                   unsigned char               *sig,
-                                   const unsigned char         *pk)
-{
-    unsigned char ph[crypto_hash_sha512_BYTES];
-
-    crypto_hash_sha512_final(&state->hs, ph);
-
-    return _crypto_sign_ed25519_verify_detached(sig, ph, sizeof ph, pk, 1);
-}
+
+#include <string.h>
+
+#include "crypto_hash_sha512.h"
+#include "crypto_sign_ed25519.h"
+#include "ref10/sign_ed25519_ref10.h"
+
+size_t
+crypto_sign_ed25519ph_statebytes(void)
+{
+    return sizeof(crypto_sign_ed25519ph_state);
+}
+
+size_t
+crypto_sign_ed25519_bytes(void)
+{
+    return crypto_sign_ed25519_BYTES;
+}
+
+size_t
+crypto_sign_ed25519_seedbytes(void)
+{
+    return crypto_sign_ed25519_SEEDBYTES;
+}
+
+size_t
+crypto_sign_ed25519_publickeybytes(void)
+{
+    return crypto_sign_ed25519_PUBLICKEYBYTES;
+}
+
+size_t
+crypto_sign_ed25519_secretkeybytes(void)
+{
+    return crypto_sign_ed25519_SECRETKEYBYTES;
+}
+
+size_t
+crypto_sign_ed25519_messagebytes_max(void)
+{
+    return crypto_sign_ed25519_MESSAGEBYTES_MAX;
+}
+
+int
+crypto_sign_ed25519_sk_to_seed(unsigned char *seed, const unsigned char *sk)
+{
+    memmove(seed, sk, crypto_sign_ed25519_SEEDBYTES);
+
+    return 0;
+}
+
+int
+crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
+{
+    memmove(pk, sk + crypto_sign_ed25519_SEEDBYTES,
+            crypto_sign_ed25519_PUBLICKEYBYTES);
+    return 0;
+}
+
+int
+crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
+{
+    crypto_hash_sha512_init(&state->hs);
+    return 0;
+}
+
+int
+crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
+                             const unsigned char *m, unsigned long long mlen)
+{
+    return crypto_hash_sha512_update(&state->hs, m, mlen);
+}
+
+int
+crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
+                                   unsigned char               *sig,
+                                   unsigned long long          *siglen_p,
+                                   const unsigned char         *sk)
+{
+    unsigned char ph[crypto_hash_sha512_BYTES];
+
+    crypto_hash_sha512_final(&state->hs, ph);
+
+    return _crypto_sign_ed25519_detached(sig, siglen_p, ph, sizeof ph, sk, 1);
+}
+
+int
+crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
+                                   const unsigned char         *sig,
+                                   const unsigned char         *pk)
+{
+    unsigned char ph[crypto_hash_sha512_BYTES];
+
+    crypto_hash_sha512_final(&state->hs, ph);
+
+    return _crypto_sign_ed25519_verify_detached(sig, ph, sizeof ph, pk, 1);
+}