gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-donau] branch master updated: add copyleft


From: gnunet
Subject: [taler-donau] branch master updated: add copyleft
Date: Mon, 17 Jun 2024 20:26:04 +0200

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new f61103c  add copyleft
f61103c is described below

commit f61103c3984b7f4d87a4e835e955ae79c0d8d5bb
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Mon Jun 17 20:28:08 2024 +0200

    add copyleft
---
 .../main/cpp/libsodium/arm64-v8a/include/sodium.h  |   1 -
 .../cpp/libsodium/arm64-v8a/include/sodium/core.h  |  11 +-
 .../include/sodium/crypto_aead_aegis128l.h         |  97 ++++----
 .../include/sodium/crypto_aead_aegis256.h          |  97 ++++----
 .../include/sodium/crypto_aead_aes256gcm.h         | 209 ++++++++--------
 .../include/sodium/crypto_aead_chacha20poly1305.h  | 270 +++++++++++----------
 .../include/sodium/crypto_aead_xchacha20poly1305.h | 127 +++++-----
 .../arm64-v8a/include/sodium/crypto_auth.h         |  22 +-
 .../include/sodium/crypto_auth_hmacsha256.h        |  55 +++--
 .../include/sodium/crypto_auth_hmacsha512.h        |  54 +++--
 .../include/sodium/crypto_auth_hmacsha512256.h     |  48 ++--
 .../arm64-v8a/include/sodium/crypto_box.h          | 175 ++++++-------
 .../crypto_box_curve25519xchacha20poly1305.h       | 216 +++++++++--------
 .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 100 ++++----
 .../arm64-v8a/include/sodium/crypto_core_ed25519.h |  80 +++---
 .../include/sodium/crypto_core_hchacha20.h         |  14 +-
 .../include/sodium/crypto_core_hsalsa20.h          |  14 +-
 .../include/sodium/crypto_core_ristretto255.h      |  88 +++----
 .../arm64-v8a/include/sodium/crypto_core_salsa20.h |  14 +-
 .../include/sodium/crypto_core_salsa2012.h         |  14 +-
 .../include/sodium/crypto_core_salsa208.h          |  22 +-
 .../arm64-v8a/include/sodium/crypto_generichash.h  |  50 ++--
 .../include/sodium/crypto_generichash_blake2b.h    |  92 +++----
 .../arm64-v8a/include/sodium/crypto_hash.h         |  10 +-
 .../arm64-v8a/include/sodium/crypto_hash_sha256.h  |  35 +--
 .../arm64-v8a/include/sodium/crypto_hash_sha512.h  |  35 +--
 .../arm64-v8a/include/sodium/crypto_kdf.h          |  26 +-
 .../arm64-v8a/include/sodium/crypto_kdf_blake2b.h  |  21 +-
 .../include/sodium/crypto_kdf_hkdf_sha256.h        |  55 +++--
 .../include/sodium/crypto_kdf_hkdf_sha512.h        |  57 +++--
 .../libsodium/arm64-v8a/include/sodium/crypto_kx.h |  54 +++--
 .../arm64-v8a/include/sodium/crypto_onetimeauth.h  |  41 ++--
 .../include/sodium/crypto_onetimeauth_poly1305.h   |  57 ++---
 .../arm64-v8a/include/sodium/crypto_pwhash.h       |  99 ++++----
 .../include/sodium/crypto_pwhash_argon2i.h         |  83 ++++---
 .../include/sodium/crypto_pwhash_argon2id.h        |  83 ++++---
 .../sodium/crypto_pwhash_scryptsalsa208sha256.h    |  93 +++----
 .../arm64-v8a/include/sodium/crypto_scalarmult.h   |  16 +-
 .../include/sodium/crypto_scalarmult_curve25519.h  |  16 +-
 .../include/sodium/crypto_scalarmult_ed25519.h     |  26 +-
 .../sodium/crypto_scalarmult_ristretto255.h        |  17 +-
 .../arm64-v8a/include/sodium/crypto_secretbox.h    |  80 +++---
 .../sodium/crypto_secretbox_xchacha20poly1305.h    |  63 ++---
 .../sodium/crypto_secretbox_xsalsa20poly1305.h     |  50 ++--
 .../sodium/crypto_secretstream_xchacha20poly1305.h |  97 ++++----
 .../arm64-v8a/include/sodium/crypto_shorthash.h    |  16 +-
 .../include/sodium/crypto_shorthash_siphash24.h    |  23 +-
 .../arm64-v8a/include/sodium/crypto_sign.h         |  78 +++---
 .../arm64-v8a/include/sodium/crypto_sign_ed25519.h | 120 ++++-----
 .../sodium/crypto_sign_edwards25519sha512batch.h   |  34 +--
 .../arm64-v8a/include/sodium/crypto_stream.h       |  26 +-
 .../include/sodium/crypto_stream_chacha20.h        |  83 ++++---
 .../include/sodium/crypto_stream_salsa20.h         |  35 +--
 .../include/sodium/crypto_stream_salsa2012.h       |  26 +-
 .../include/sodium/crypto_stream_salsa208.h        |  33 +--
 .../include/sodium/crypto_stream_xchacha20.h       |  36 +--
 .../include/sodium/crypto_stream_xsalsa20.h        |  35 +--
 .../arm64-v8a/include/sodium/crypto_verify_16.h    |   6 +-
 .../arm64-v8a/include/sodium/crypto_verify_32.h    |   6 +-
 .../arm64-v8a/include/sodium/crypto_verify_64.h    |   6 +-
 .../libsodium/arm64-v8a/include/sodium/export.h    |  13 +-
 .../arm64-v8a/include/sodium/randombytes.h         |  49 ++--
 .../include/sodium/randombytes_internal_random.h   |   1 -
 .../include/sodium/randombytes_sysrandom.h         |   1 -
 .../libsodium/arm64-v8a/include/sodium/runtime.h   |  27 +--
 .../cpp/libsodium/arm64-v8a/include/sodium/utils.h | 105 ++++----
 .../libsodium/arm64-v8a/include/sodium/version.h   |   9 +-
 .../cpp/libsodium/armeabi-v7a/include/sodium.h     |   1 -
 .../libsodium/armeabi-v7a/include/sodium/core.h    |  11 +-
 .../include/sodium/crypto_aead_aegis128l.h         |  97 ++++----
 .../include/sodium/crypto_aead_aegis256.h          |  97 ++++----
 .../include/sodium/crypto_aead_aes256gcm.h         | 209 ++++++++--------
 .../include/sodium/crypto_aead_chacha20poly1305.h  | 270 +++++++++++----------
 .../include/sodium/crypto_aead_xchacha20poly1305.h | 127 +++++-----
 .../armeabi-v7a/include/sodium/crypto_auth.h       |  22 +-
 .../include/sodium/crypto_auth_hmacsha256.h        |  55 +++--
 .../include/sodium/crypto_auth_hmacsha512.h        |  54 +++--
 .../include/sodium/crypto_auth_hmacsha512256.h     |  48 ++--
 .../armeabi-v7a/include/sodium/crypto_box.h        | 175 ++++++-------
 .../crypto_box_curve25519xchacha20poly1305.h       | 216 +++++++++--------
 .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 100 ++++----
 .../include/sodium/crypto_core_ed25519.h           |  80 +++---
 .../include/sodium/crypto_core_hchacha20.h         |  14 +-
 .../include/sodium/crypto_core_hsalsa20.h          |  14 +-
 .../include/sodium/crypto_core_ristretto255.h      |  88 +++----
 .../include/sodium/crypto_core_salsa20.h           |  14 +-
 .../include/sodium/crypto_core_salsa2012.h         |  14 +-
 .../include/sodium/crypto_core_salsa208.h          |  22 +-
 .../include/sodium/crypto_generichash.h            |  50 ++--
 .../include/sodium/crypto_generichash_blake2b.h    |  92 +++----
 .../armeabi-v7a/include/sodium/crypto_hash.h       |  10 +-
 .../include/sodium/crypto_hash_sha256.h            |  35 +--
 .../include/sodium/crypto_hash_sha512.h            |  35 +--
 .../armeabi-v7a/include/sodium/crypto_kdf.h        |  26 +-
 .../include/sodium/crypto_kdf_blake2b.h            |  21 +-
 .../include/sodium/crypto_kdf_hkdf_sha256.h        |  55 +++--
 .../include/sodium/crypto_kdf_hkdf_sha512.h        |  57 +++--
 .../armeabi-v7a/include/sodium/crypto_kx.h         |  54 +++--
 .../include/sodium/crypto_onetimeauth.h            |  41 ++--
 .../include/sodium/crypto_onetimeauth_poly1305.h   |  57 ++---
 .../armeabi-v7a/include/sodium/crypto_pwhash.h     |  99 ++++----
 .../include/sodium/crypto_pwhash_argon2i.h         |  83 ++++---
 .../include/sodium/crypto_pwhash_argon2id.h        |  83 ++++---
 .../sodium/crypto_pwhash_scryptsalsa208sha256.h    |  93 +++----
 .../armeabi-v7a/include/sodium/crypto_scalarmult.h |  16 +-
 .../include/sodium/crypto_scalarmult_curve25519.h  |  16 +-
 .../include/sodium/crypto_scalarmult_ed25519.h     |  26 +-
 .../sodium/crypto_scalarmult_ristretto255.h        |  17 +-
 .../armeabi-v7a/include/sodium/crypto_secretbox.h  |  80 +++---
 .../sodium/crypto_secretbox_xchacha20poly1305.h    |  63 ++---
 .../sodium/crypto_secretbox_xsalsa20poly1305.h     |  50 ++--
 .../sodium/crypto_secretstream_xchacha20poly1305.h |  97 ++++----
 .../armeabi-v7a/include/sodium/crypto_shorthash.h  |  16 +-
 .../include/sodium/crypto_shorthash_siphash24.h    |  23 +-
 .../armeabi-v7a/include/sodium/crypto_sign.h       |  78 +++---
 .../include/sodium/crypto_sign_ed25519.h           | 120 ++++-----
 .../sodium/crypto_sign_edwards25519sha512batch.h   |  34 +--
 .../armeabi-v7a/include/sodium/crypto_stream.h     |  26 +-
 .../include/sodium/crypto_stream_chacha20.h        |  83 ++++---
 .../include/sodium/crypto_stream_salsa20.h         |  35 +--
 .../include/sodium/crypto_stream_salsa2012.h       |  26 +-
 .../include/sodium/crypto_stream_salsa208.h        |  33 +--
 .../include/sodium/crypto_stream_xchacha20.h       |  36 +--
 .../include/sodium/crypto_stream_xsalsa20.h        |  35 +--
 .../armeabi-v7a/include/sodium/crypto_verify_16.h  |   6 +-
 .../armeabi-v7a/include/sodium/crypto_verify_32.h  |   6 +-
 .../armeabi-v7a/include/sodium/crypto_verify_64.h  |   6 +-
 .../libsodium/armeabi-v7a/include/sodium/export.h  |  13 +-
 .../armeabi-v7a/include/sodium/randombytes.h       |  49 ++--
 .../include/sodium/randombytes_internal_random.h   |   1 -
 .../include/sodium/randombytes_sysrandom.h         |   1 -
 .../libsodium/armeabi-v7a/include/sodium/runtime.h |  27 +--
 .../libsodium/armeabi-v7a/include/sodium/utils.h   | 105 ++++----
 .../libsodium/armeabi-v7a/include/sodium/version.h |   9 +-
 .../app/src/main/cpp/libsodium/include/sodium.h    |   1 -
 .../src/main/cpp/libsodium/include/sodium/core.h   |  11 +-
 .../include/sodium/crypto_aead_aegis128l.h         |  97 ++++----
 .../include/sodium/crypto_aead_aegis256.h          |  97 ++++----
 .../include/sodium/crypto_aead_aes256gcm.h         | 209 ++++++++--------
 .../include/sodium/crypto_aead_chacha20poly1305.h  | 270 +++++++++++----------
 .../include/sodium/crypto_aead_xchacha20poly1305.h | 127 +++++-----
 .../cpp/libsodium/include/sodium/crypto_auth.h     |  22 +-
 .../include/sodium/crypto_auth_hmacsha256.h        |  55 +++--
 .../include/sodium/crypto_auth_hmacsha512.h        |  54 +++--
 .../include/sodium/crypto_auth_hmacsha512256.h     |  48 ++--
 .../main/cpp/libsodium/include/sodium/crypto_box.h | 175 ++++++-------
 .../crypto_box_curve25519xchacha20poly1305.h       | 216 +++++++++--------
 .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 100 ++++----
 .../libsodium/include/sodium/crypto_core_ed25519.h |  80 +++---
 .../include/sodium/crypto_core_hchacha20.h         |  14 +-
 .../include/sodium/crypto_core_hsalsa20.h          |  14 +-
 .../include/sodium/crypto_core_ristretto255.h      |  88 +++----
 .../libsodium/include/sodium/crypto_core_salsa20.h |  14 +-
 .../include/sodium/crypto_core_salsa2012.h         |  14 +-
 .../include/sodium/crypto_core_salsa208.h          |  22 +-
 .../libsodium/include/sodium/crypto_generichash.h  |  50 ++--
 .../include/sodium/crypto_generichash_blake2b.h    |  92 +++----
 .../cpp/libsodium/include/sodium/crypto_hash.h     |  10 +-
 .../libsodium/include/sodium/crypto_hash_sha256.h  |  35 +--
 .../libsodium/include/sodium/crypto_hash_sha512.h  |  35 +--
 .../main/cpp/libsodium/include/sodium/crypto_kdf.h |  26 +-
 .../libsodium/include/sodium/crypto_kdf_blake2b.h  |  21 +-
 .../include/sodium/crypto_kdf_hkdf_sha256.h        |  55 +++--
 .../include/sodium/crypto_kdf_hkdf_sha512.h        |  57 +++--
 .../main/cpp/libsodium/include/sodium/crypto_kx.h  |  54 +++--
 .../libsodium/include/sodium/crypto_onetimeauth.h  |  41 ++--
 .../include/sodium/crypto_onetimeauth_poly1305.h   |  57 ++---
 .../cpp/libsodium/include/sodium/crypto_pwhash.h   |  99 ++++----
 .../include/sodium/crypto_pwhash_argon2i.h         |  83 ++++---
 .../include/sodium/crypto_pwhash_argon2id.h        |  83 ++++---
 .../sodium/crypto_pwhash_scryptsalsa208sha256.h    |  93 +++----
 .../libsodium/include/sodium/crypto_scalarmult.h   |  16 +-
 .../include/sodium/crypto_scalarmult_curve25519.h  |  16 +-
 .../include/sodium/crypto_scalarmult_ed25519.h     |  26 +-
 .../sodium/crypto_scalarmult_ristretto255.h        |  17 +-
 .../libsodium/include/sodium/crypto_secretbox.h    |  80 +++---
 .../sodium/crypto_secretbox_xchacha20poly1305.h    |  63 ++---
 .../sodium/crypto_secretbox_xsalsa20poly1305.h     |  50 ++--
 .../sodium/crypto_secretstream_xchacha20poly1305.h |  97 ++++----
 .../libsodium/include/sodium/crypto_shorthash.h    |  16 +-
 .../include/sodium/crypto_shorthash_siphash24.h    |  23 +-
 .../cpp/libsodium/include/sodium/crypto_sign.h     |  78 +++---
 .../libsodium/include/sodium/crypto_sign_ed25519.h | 120 ++++-----
 .../sodium/crypto_sign_edwards25519sha512batch.h   |  34 +--
 .../cpp/libsodium/include/sodium/crypto_stream.h   |  26 +-
 .../include/sodium/crypto_stream_chacha20.h        |  83 ++++---
 .../include/sodium/crypto_stream_salsa20.h         |  35 +--
 .../include/sodium/crypto_stream_salsa2012.h       |  26 +-
 .../include/sodium/crypto_stream_salsa208.h        |  33 +--
 .../include/sodium/crypto_stream_xchacha20.h       |  36 +--
 .../include/sodium/crypto_stream_xsalsa20.h        |  35 +--
 .../libsodium/include/sodium/crypto_verify_16.h    |   6 +-
 .../libsodium/include/sodium/crypto_verify_32.h    |   6 +-
 .../libsodium/include/sodium/crypto_verify_64.h    |   6 +-
 .../src/main/cpp/libsodium/include/sodium/export.h |  13 +-
 .../cpp/libsodium/include/sodium/randombytes.h     |  49 ++--
 .../include/sodium/randombytes_internal_random.h   |   1 -
 .../include/sodium/randombytes_sysrandom.h         |   1 -
 .../main/cpp/libsodium/include/sodium/runtime.h    |  27 +--
 .../src/main/cpp/libsodium/include/sodium/utils.h  | 105 ++++----
 .../main/cpp/libsodium/include/sodium/version.h    |   9 +-
 .../src/main/cpp/libsodium/x86/include/sodium.h    |   1 -
 .../main/cpp/libsodium/x86/include/sodium/core.h   |  11 +-
 .../x86/include/sodium/crypto_aead_aegis128l.h     |  97 ++++----
 .../x86/include/sodium/crypto_aead_aegis256.h      |  97 ++++----
 .../x86/include/sodium/crypto_aead_aes256gcm.h     | 209 ++++++++--------
 .../include/sodium/crypto_aead_chacha20poly1305.h  | 270 +++++++++++----------
 .../include/sodium/crypto_aead_xchacha20poly1305.h | 127 +++++-----
 .../cpp/libsodium/x86/include/sodium/crypto_auth.h |  22 +-
 .../x86/include/sodium/crypto_auth_hmacsha256.h    |  55 +++--
 .../x86/include/sodium/crypto_auth_hmacsha512.h    |  54 +++--
 .../x86/include/sodium/crypto_auth_hmacsha512256.h |  48 ++--
 .../cpp/libsodium/x86/include/sodium/crypto_box.h  | 175 ++++++-------
 .../crypto_box_curve25519xchacha20poly1305.h       | 216 +++++++++--------
 .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 100 ++++----
 .../x86/include/sodium/crypto_core_ed25519.h       |  80 +++---
 .../x86/include/sodium/crypto_core_hchacha20.h     |  14 +-
 .../x86/include/sodium/crypto_core_hsalsa20.h      |  14 +-
 .../x86/include/sodium/crypto_core_ristretto255.h  |  88 +++----
 .../x86/include/sodium/crypto_core_salsa20.h       |  14 +-
 .../x86/include/sodium/crypto_core_salsa2012.h     |  14 +-
 .../x86/include/sodium/crypto_core_salsa208.h      |  22 +-
 .../x86/include/sodium/crypto_generichash.h        |  50 ++--
 .../include/sodium/crypto_generichash_blake2b.h    |  92 +++----
 .../cpp/libsodium/x86/include/sodium/crypto_hash.h |  10 +-
 .../x86/include/sodium/crypto_hash_sha256.h        |  35 +--
 .../x86/include/sodium/crypto_hash_sha512.h        |  35 +--
 .../cpp/libsodium/x86/include/sodium/crypto_kdf.h  |  26 +-
 .../x86/include/sodium/crypto_kdf_blake2b.h        |  21 +-
 .../x86/include/sodium/crypto_kdf_hkdf_sha256.h    |  55 +++--
 .../x86/include/sodium/crypto_kdf_hkdf_sha512.h    |  57 +++--
 .../cpp/libsodium/x86/include/sodium/crypto_kx.h   |  54 +++--
 .../x86/include/sodium/crypto_onetimeauth.h        |  41 ++--
 .../include/sodium/crypto_onetimeauth_poly1305.h   |  57 ++---
 .../libsodium/x86/include/sodium/crypto_pwhash.h   |  99 ++++----
 .../x86/include/sodium/crypto_pwhash_argon2i.h     |  83 ++++---
 .../x86/include/sodium/crypto_pwhash_argon2id.h    |  83 ++++---
 .../sodium/crypto_pwhash_scryptsalsa208sha256.h    |  93 +++----
 .../x86/include/sodium/crypto_scalarmult.h         |  16 +-
 .../include/sodium/crypto_scalarmult_curve25519.h  |  16 +-
 .../x86/include/sodium/crypto_scalarmult_ed25519.h |  26 +-
 .../sodium/crypto_scalarmult_ristretto255.h        |  17 +-
 .../x86/include/sodium/crypto_secretbox.h          |  80 +++---
 .../sodium/crypto_secretbox_xchacha20poly1305.h    |  63 ++---
 .../sodium/crypto_secretbox_xsalsa20poly1305.h     |  50 ++--
 .../sodium/crypto_secretstream_xchacha20poly1305.h |  97 ++++----
 .../x86/include/sodium/crypto_shorthash.h          |  16 +-
 .../include/sodium/crypto_shorthash_siphash24.h    |  23 +-
 .../cpp/libsodium/x86/include/sodium/crypto_sign.h |  78 +++---
 .../x86/include/sodium/crypto_sign_ed25519.h       | 120 ++++-----
 .../sodium/crypto_sign_edwards25519sha512batch.h   |  34 +--
 .../libsodium/x86/include/sodium/crypto_stream.h   |  26 +-
 .../x86/include/sodium/crypto_stream_chacha20.h    |  83 ++++---
 .../x86/include/sodium/crypto_stream_salsa20.h     |  35 +--
 .../x86/include/sodium/crypto_stream_salsa2012.h   |  26 +-
 .../x86/include/sodium/crypto_stream_salsa208.h    |  33 +--
 .../x86/include/sodium/crypto_stream_xchacha20.h   |  36 +--
 .../x86/include/sodium/crypto_stream_xsalsa20.h    |  35 +--
 .../x86/include/sodium/crypto_verify_16.h          |   6 +-
 .../x86/include/sodium/crypto_verify_32.h          |   6 +-
 .../x86/include/sodium/crypto_verify_64.h          |   6 +-
 .../main/cpp/libsodium/x86/include/sodium/export.h |  13 +-
 .../cpp/libsodium/x86/include/sodium/randombytes.h |  49 ++--
 .../include/sodium/randombytes_internal_random.h   |   1 -
 .../x86/include/sodium/randombytes_sysrandom.h     |   1 -
 .../cpp/libsodium/x86/include/sodium/runtime.h     |  27 +--
 .../main/cpp/libsodium/x86/include/sodium/utils.h  | 105 ++++----
 .../cpp/libsodium/x86/include/sodium/version.h     |   9 +-
 .../src/main/cpp/libsodium/x86_64/include/sodium.h |   1 -
 .../cpp/libsodium/x86_64/include/sodium/core.h     |  11 +-
 .../x86_64/include/sodium/crypto_aead_aegis128l.h  |  97 ++++----
 .../x86_64/include/sodium/crypto_aead_aegis256.h   |  97 ++++----
 .../x86_64/include/sodium/crypto_aead_aes256gcm.h  | 209 ++++++++--------
 .../include/sodium/crypto_aead_chacha20poly1305.h  | 270 +++++++++++----------
 .../include/sodium/crypto_aead_xchacha20poly1305.h | 127 +++++-----
 .../libsodium/x86_64/include/sodium/crypto_auth.h  |  22 +-
 .../x86_64/include/sodium/crypto_auth_hmacsha256.h |  55 +++--
 .../x86_64/include/sodium/crypto_auth_hmacsha512.h |  54 +++--
 .../include/sodium/crypto_auth_hmacsha512256.h     |  48 ++--
 .../libsodium/x86_64/include/sodium/crypto_box.h   | 175 ++++++-------
 .../crypto_box_curve25519xchacha20poly1305.h       | 216 +++++++++--------
 .../sodium/crypto_box_curve25519xsalsa20poly1305.h | 100 ++++----
 .../x86_64/include/sodium/crypto_core_ed25519.h    |  80 +++---
 .../x86_64/include/sodium/crypto_core_hchacha20.h  |  14 +-
 .../x86_64/include/sodium/crypto_core_hsalsa20.h   |  14 +-
 .../include/sodium/crypto_core_ristretto255.h      |  88 +++----
 .../x86_64/include/sodium/crypto_core_salsa20.h    |  14 +-
 .../x86_64/include/sodium/crypto_core_salsa2012.h  |  14 +-
 .../x86_64/include/sodium/crypto_core_salsa208.h   |  22 +-
 .../x86_64/include/sodium/crypto_generichash.h     |  50 ++--
 .../include/sodium/crypto_generichash_blake2b.h    |  92 +++----
 .../libsodium/x86_64/include/sodium/crypto_hash.h  |  10 +-
 .../x86_64/include/sodium/crypto_hash_sha256.h     |  35 +--
 .../x86_64/include/sodium/crypto_hash_sha512.h     |  35 +--
 .../libsodium/x86_64/include/sodium/crypto_kdf.h   |  26 +-
 .../x86_64/include/sodium/crypto_kdf_blake2b.h     |  21 +-
 .../x86_64/include/sodium/crypto_kdf_hkdf_sha256.h |  55 +++--
 .../x86_64/include/sodium/crypto_kdf_hkdf_sha512.h |  57 +++--
 .../libsodium/x86_64/include/sodium/crypto_kx.h    |  54 +++--
 .../x86_64/include/sodium/crypto_onetimeauth.h     |  41 ++--
 .../include/sodium/crypto_onetimeauth_poly1305.h   |  57 ++---
 .../x86_64/include/sodium/crypto_pwhash.h          |  99 ++++----
 .../x86_64/include/sodium/crypto_pwhash_argon2i.h  |  83 ++++---
 .../x86_64/include/sodium/crypto_pwhash_argon2id.h |  83 ++++---
 .../sodium/crypto_pwhash_scryptsalsa208sha256.h    |  93 +++----
 .../x86_64/include/sodium/crypto_scalarmult.h      |  16 +-
 .../include/sodium/crypto_scalarmult_curve25519.h  |  16 +-
 .../include/sodium/crypto_scalarmult_ed25519.h     |  26 +-
 .../sodium/crypto_scalarmult_ristretto255.h        |  17 +-
 .../x86_64/include/sodium/crypto_secretbox.h       |  80 +++---
 .../sodium/crypto_secretbox_xchacha20poly1305.h    |  63 ++---
 .../sodium/crypto_secretbox_xsalsa20poly1305.h     |  50 ++--
 .../sodium/crypto_secretstream_xchacha20poly1305.h |  97 ++++----
 .../x86_64/include/sodium/crypto_shorthash.h       |  16 +-
 .../include/sodium/crypto_shorthash_siphash24.h    |  23 +-
 .../libsodium/x86_64/include/sodium/crypto_sign.h  |  78 +++---
 .../x86_64/include/sodium/crypto_sign_ed25519.h    | 120 ++++-----
 .../sodium/crypto_sign_edwards25519sha512batch.h   |  34 +--
 .../x86_64/include/sodium/crypto_stream.h          |  26 +-
 .../x86_64/include/sodium/crypto_stream_chacha20.h |  83 ++++---
 .../x86_64/include/sodium/crypto_stream_salsa20.h  |  35 +--
 .../include/sodium/crypto_stream_salsa2012.h       |  26 +-
 .../x86_64/include/sodium/crypto_stream_salsa208.h |  33 +--
 .../include/sodium/crypto_stream_xchacha20.h       |  36 +--
 .../x86_64/include/sodium/crypto_stream_xsalsa20.h |  35 +--
 .../x86_64/include/sodium/crypto_verify_16.h       |   6 +-
 .../x86_64/include/sodium/crypto_verify_32.h       |   6 +-
 .../x86_64/include/sodium/crypto_verify_64.h       |   6 +-
 .../cpp/libsodium/x86_64/include/sodium/export.h   |  13 +-
 .../libsodium/x86_64/include/sodium/randombytes.h  |  49 ++--
 .../include/sodium/randombytes_internal_random.h   |   1 -
 .../x86_64/include/sodium/randombytes_sysrandom.h  |   1 -
 .../cpp/libsodium/x86_64/include/sodium/runtime.h  |  27 +--
 .../cpp/libsodium/x86_64/include/sodium/utils.h    | 105 ++++----
 .../cpp/libsodium/x86_64/include/sodium/version.h  |   9 +-
 verification-app/app/src/main/cpp/verification.cpp |  16 ++
 336 files changed, 9881 insertions(+), 8895 deletions(-)

diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium.h 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium.h
index 86b7a4d..f11f028 100644
--- a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium.h
+++ b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_H
 #define sodium_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/core.h 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/core.h
index dd088d2..921c7e6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/core.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/core.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_core_H
 #define sodium_core_H
 
@@ -9,17 +8,17 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int sodium_init(void)
-            __attribute__ ((warn_unused_result));
+int sodium_init (void)
+__attribute__ ((warn_unused_result));
 
 /* ---- */
 
 SODIUM_EXPORT
-int sodium_set_misuse_handler(void (*handler)(void));
+int sodium_set_misuse_handler (void (*handler)(void));
 
 SODIUM_EXPORT
-void sodium_misuse(void)
-            __attribute__ ((noreturn));
+void sodium_misuse (void)
+__attribute__ ((noreturn));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis128l.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis128l.h
index 0ad019f..ba8a2c6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis128l.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis128l.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis128l_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_keybytes(void);
+size_t crypto_aead_aegis128l_keybytes (void);
 
 #define crypto_aead_aegis128l_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_nsecbytes(void);
+size_t crypto_aead_aegis128l_nsecbytes (void);
 
 #define crypto_aead_aegis128l_NPUBBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_npubbytes(void);
+size_t crypto_aead_aegis128l_npubbytes (void);
 
 #define crypto_aead_aegis128l_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_abytes(void);
+size_t crypto_aead_aegis128l_abytes (void);
 
 #define crypto_aead_aegis128l_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 
1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_messagebytes_max(void);
+size_t crypto_aead_aegis128l_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt(unsigned char       *c,
-                                  unsigned long long  *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long   mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis128l_encrypt (unsigned char       *c,
+                                   unsigned long long  *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt(unsigned char       *m,
-                                  unsigned long long  *mlen_p,
-                                  unsigned char       *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long   clen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis128l_decrypt (unsigned char       *m,
+                                   unsigned long long  *mlen_p,
+                                   unsigned char       *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt_detached(unsigned char       *c,
-                                           unsigned char       *mac,
-                                           unsigned long long  *maclen_p,
-                                           const unsigned char *m,
-                                           unsigned long long   mlen,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *nsec,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis128l_encrypt_detached (unsigned char       *c,
+                                            unsigned char       *mac,
+                                            unsigned long long  *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt_detached(unsigned char       *m,
-                                           unsigned char       *nsec,
-                                           const unsigned char *c,
-                                           unsigned long long   clen,
-                                           const unsigned char *mac,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis128l_decrypt_detached (unsigned char       *m,
+                                            unsigned char       *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis128l_keygen(unsigned char 
k[crypto_aead_aegis128l_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis128l_keygen (unsigned char
+                                   k[crypto_aead_aegis128l_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis256.h
index 26bd18a..6b3feff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aegis256.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_keybytes(void);
+size_t crypto_aead_aegis256_keybytes (void);
 
 #define crypto_aead_aegis256_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_nsecbytes(void);
+size_t crypto_aead_aegis256_nsecbytes (void);
 
 #define crypto_aead_aegis256_NPUBBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_npubbytes(void);
+size_t crypto_aead_aegis256_npubbytes (void);
 
 #define crypto_aead_aegis256_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_abytes(void);
+size_t crypto_aead_aegis256_abytes (void);
 
 #define crypto_aead_aegis256_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_messagebytes_max(void);
+size_t crypto_aead_aegis256_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt(unsigned char       *c,
-                                 unsigned long long  *clen_p,
-                                 const unsigned char *m,
-                                 unsigned long long   mlen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *nsec,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis256_encrypt (unsigned char       *c,
+                                  unsigned long long  *clen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *nsec,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt(unsigned char       *m,
-                                 unsigned long long  *mlen_p,
-                                 unsigned char       *nsec,
-                                 const unsigned char *c,
-                                 unsigned long long   clen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis256_decrypt (unsigned char       *m,
+                                  unsigned long long  *mlen_p,
+                                  unsigned char       *nsec,
+                                  const unsigned char *c,
+                                  unsigned long long clen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt_detached(unsigned char       *c,
-                                          unsigned char       *mac,
-                                          unsigned long long  *maclen_p,
-                                          const unsigned char *m,
-                                          unsigned long long   mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis256_encrypt_detached (unsigned char       *c,
+                                           unsigned char       *mac,
+                                           unsigned long long  *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt_detached(unsigned char       *m,
-                                          unsigned char       *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long   clen,
-                                          const unsigned char *mac,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis256_decrypt_detached (unsigned char       *m,
+                                           unsigned char       *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis256_keygen(unsigned char 
k[crypto_aead_aegis256_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis256_keygen (unsigned char
+                                  k[crypto_aead_aegis256_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aes256gcm.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aes256gcm.h
index 9baeb3f..5d259ff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aes256gcm.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_aes256gcm.h
@@ -32,145 +32,154 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_is_available(void);
+int crypto_aead_aes256gcm_is_available (void);
 
 #define crypto_aead_aes256gcm_KEYBYTES  32U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_keybytes(void);
+size_t crypto_aead_aes256gcm_keybytes (void);
 
 #define crypto_aead_aes256gcm_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_nsecbytes(void);
+size_t crypto_aead_aes256gcm_nsecbytes (void);
 
 #define crypto_aead_aes256gcm_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_npubbytes(void);
+size_t crypto_aead_aes256gcm_npubbytes (void);
 
 #define crypto_aead_aes256gcm_ABYTES    16U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_abytes(void);
+size_t crypto_aead_aes256gcm_abytes (void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)))
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
+              (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_messagebytes_max(void);
+size_t crypto_aead_aes256gcm_messagebytes_max (void);
 
-typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_ {
-    unsigned char opaque[512];
+typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_
+{
+  unsigned char opaque[512];
 } crypto_aead_aes256gcm_state;
 
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_statebytes(void);
+size_t crypto_aead_aes256gcm_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt(unsigned char *c,
-                                  unsigned long long *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_aes256gcm_encrypt (unsigned char *c,
+                                   unsigned long long *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt (unsigned char *m,
+                                   unsigned long long *mlen_p,
+                                   unsigned char *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached (unsigned char *c,
+                                            unsigned char *mac,
+                                            unsigned long long *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached (unsigned char *m,
+                                            unsigned char *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+/* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt(unsigned char *m,
-                                  unsigned long long *mlen_p,
-                                  unsigned char *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long clen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_aes256gcm_beforenm (crypto_aead_aes256gcm_state *ctx_,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
-                                           unsigned char *mac,
-                                           unsigned long long *maclen_p,
+int crypto_aead_aes256gcm_encrypt_afternm (unsigned char *c,
+                                           unsigned long long *clen_p,
                                            const unsigned char *m,
                                            unsigned long long mlen,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *nsec,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+int crypto_aead_aes256gcm_decrypt_afternm (unsigned char *m,
+                                           unsigned long long *mlen_p,
                                            unsigned char *nsec,
                                            const unsigned char *c,
                                            unsigned long long clen,
-                                           const unsigned char *mac,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-/* -- Precomputation interface -- */
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_afternm(unsigned char *c,
-                                          unsigned long long *clen_p,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
-                                          unsigned long long *mlen_p,
-                                          unsigned char *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long clen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
-                                                   unsigned char *mac,
-                                                   unsigned long long 
*maclen_p,
-                                                   const unsigned char *m,
-                                                   unsigned long long mlen,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *nsec,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
-                                                   unsigned char *nsec,
-                                                   const unsigned char *c,
-                                                   unsigned long long clen,
-                                                   const unsigned char *mac,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_aes256gcm_keygen(unsigned char 
k[crypto_aead_aes256gcm_KEYBYTES])
-            __attribute__ ((nonnull));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm (unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long
+                                                    long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm (unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_aes256gcm_keygen (unsigned char
+                                   k[crypto_aead_aes256gcm_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_chacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_chacha20poly1305.h
index 5d671df..686f5aa 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_chacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_chacha20poly1305.h
@@ -15,163 +15,181 @@ extern "C" {
 
 #define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
 
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * ((1ULL << 32) - 1ULL)))
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                       unsigned char *mac,
-                                                       unsigned long long 
*maclen_p,
-                                                       const unsigned char *m,
-                                                       unsigned long long mlen,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*nsec,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                       unsigned char *nsec,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char 
*mac,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+              (64ULL * ((1ULL << 32) - 1ULL)))
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt (unsigned char *c,
+                                               unsigned long long *clen_p,
+                                               const unsigned char *m,
+                                               unsigned long long mlen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *nsec,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt (unsigned char *m,
+                                               unsigned long long *mlen_p,
+                                               unsigned char *nsec,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                        unsigned char *mac,
+                                                        unsigned long
+                                                        long *maclen_p,
+                                                        const unsigned char *m,
+                                                        unsigned long long 
mlen,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *nsec,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                        unsigned char *nsec,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned
+                                                        char *mac,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_ietf_keygen (unsigned char
+                                               k[
+                                                 
crypto_aead_chacha20poly1305_ietf_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit 
internal counter -- */
 
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_keybytes(void);
+size_t crypto_aead_chacha20poly1305_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_NPUBBYTES 8U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_abytes(void);
+size_t crypto_aead_chacha20poly1305_abytes (void);
 
 #define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
-                                         unsigned long long *clen_p,
-                                         const unsigned char *m,
-                                         unsigned long long mlen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *nsec,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
-                                         unsigned long long *mlen_p,
-                                         unsigned char *nsec,
-                                         const unsigned char *c,
-                                         unsigned long long clen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
-                                                  unsigned char *mac,
-                                                  unsigned long long *maclen_p,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *nsec,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
-                                                  unsigned char *nsec,
-                                                  const unsigned char *c,
-                                                  unsigned long long clen,
-                                                  const unsigned char *mac,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt (unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt (unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt_detached (unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long 
*maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt_detached (unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_keygen (unsigned char
+                                          k[
+                                            
crypto_aead_chacha20poly1305_KEYBYTES
+                                          ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         
crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        
crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        
crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES           
crypto_aead_chacha20poly1305_ietf_ABYTES
-#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           \
+  crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_xchacha20poly1305.h
index 6643b0c..6bdd39f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_aead_xchacha20poly1305.h
@@ -13,85 +13,104 @@ extern "C" {
 
 #define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
-                                               unsigned long long *clen_p,
-                                               const unsigned char *m,
-                                               unsigned long long mlen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *nsec,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt (unsigned char *c,
+                                                unsigned long long *clen_p,
+                                                const unsigned char *m,
+                                                unsigned long long mlen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *nsec,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
-                                               unsigned long long *mlen_p,
-                                               unsigned char *nsec,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt (unsigned char *m,
+                                                unsigned long long *mlen_p,
+                                                unsigned char *nsec,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                        unsigned char *mac,
-                                                        unsigned long long 
*maclen_p,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*nsec,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                         unsigned char *mac,
+                                                         unsigned long
+                                                         long *maclen_p,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *nsec,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                        unsigned char *nsec,
-                                                        const unsigned char *c,
-                                                        unsigned long long 
clen,
-                                                        const unsigned char 
*mac,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                         unsigned char *nsec,
+                                                         const unsigned char 
*c,
+                                                         unsigned long long
+                                                         clen,
+                                                         const unsigned
+                                                         char *mac,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_aead_xchacha20poly1305_ietf_keygen (unsigned char
+                                                k[
+                                                  
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+                                                ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        
crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        
crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES           
crypto_aead_xchacha20poly1305_ietf_ABYTES
-#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           \
+  crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth.h
index 540aee0..ef7e5d9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth.h
@@ -15,29 +15,29 @@ extern "C" {
 
 #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
 SODIUM_EXPORT
-size_t  crypto_auth_bytes(void);
+size_t  crypto_auth_bytes (void);
 
 #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_auth_keybytes(void);
+size_t  crypto_auth_keybytes (void);
 
 #define crypto_auth_PRIMITIVE "hmacsha512256"
 SODIUM_EXPORT
-const char *crypto_auth_primitive(void);
+const char *crypto_auth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_auth(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_auth (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_verify (const unsigned char *h, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_auth_keygen(unsigned char k[crypto_auth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_keygen (unsigned char k[crypto_auth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha256.h
index 3da864c..925d0cc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha256.h
@@ -14,54 +14,57 @@ extern "C" {
 
 #define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_bytes(void);
+size_t crypto_auth_hmacsha256_bytes (void);
 
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_keybytes(void);
+size_t crypto_auth_hmacsha256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha256_state {
-    crypto_hash_sha256_state ictx;
-    crypto_hash_sha256_state octx;
+typedef struct crypto_auth_hmacsha256_state
+{
+  crypto_hash_sha256_state ictx;
+  crypto_hash_sha256_state octx;
 } crypto_auth_hmacsha256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_statebytes(void);
+size_t crypto_auth_hmacsha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_init (crypto_auth_hmacsha256_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_auth_hmacsha256_update (crypto_auth_hmacsha256_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_final (crypto_auth_hmacsha256_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha256_keygen(unsigned char 
k[crypto_auth_hmacsha256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha256_keygen (unsigned char
+                                    k[crypto_auth_hmacsha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512.h
index d992cb8..e5fd3ca 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512.h
@@ -14,52 +14,56 @@ extern "C" {
 
 #define crypto_auth_hmacsha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_bytes(void);
+size_t crypto_auth_hmacsha512_bytes (void);
 
 #define crypto_auth_hmacsha512_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_keybytes(void);
+size_t crypto_auth_hmacsha512_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha512_state {
-    crypto_hash_sha512_state ictx;
-    crypto_hash_sha512_state octx;
+typedef struct crypto_auth_hmacsha512_state
+{
+  crypto_hash_sha512_state ictx;
+  crypto_hash_sha512_state octx;
 } crypto_auth_hmacsha512_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_statebytes(void);
+size_t crypto_auth_hmacsha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_init (crypto_auth_hmacsha512_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512_update (crypto_auth_hmacsha512_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_final (crypto_auth_hmacsha512_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512_keygen(unsigned char 
k[crypto_auth_hmacsha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512_keygen (unsigned char
+                                    k[crypto_auth_hmacsha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512256.h
index 3fb5263..25a0787 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_auth_hmacsha512256.h
@@ -14,49 +14,53 @@ extern "C" {
 
 #define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_bytes(void);
+size_t crypto_auth_hmacsha512256_bytes (void);
 
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_keybytes(void);
+size_t crypto_auth_hmacsha512256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *out,
-                              const unsigned char *in,
-                              unsigned long long inlen,
-                              const unsigned char *k) __attribute__ 
((nonnull(1, 4)));
+int crypto_auth_hmacsha512256 (unsigned char *out,
+                               const unsigned char *in,
+                               unsigned long long inlen,
+                               const unsigned char *k) __attribute__ (
+  (nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *h,
-                                     const unsigned char *in,
-                                     unsigned long long inlen,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512256_verify (const unsigned char *h,
+                                      const unsigned char *in,
+                                      unsigned long long inlen,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
 typedef crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_statebytes(void);
+size_t crypto_auth_hmacsha512256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
-                                   const unsigned char *key,
-                                   size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512256_init (crypto_auth_hmacsha512256_state *state,
+                                    const unsigned char *key,
+                                    size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
-                                     const unsigned char *in,
-                                     unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512256_update (crypto_auth_hmacsha512256_state *state,
+                                      const unsigned char *in,
+                                      unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
-                                    unsigned char *out) __attribute__ 
((nonnull));
+int crypto_auth_hmacsha512256_final (crypto_auth_hmacsha512256_state *state,
+                                     unsigned char *out) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512256_keygen(unsigned char 
k[crypto_auth_hmacsha512256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512256_keygen (unsigned char
+                                       k[crypto_auth_hmacsha512256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box.h
index e060dd2..41190bd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box.h
@@ -22,153 +22,164 @@ extern "C" {
 
 #define crypto_box_SEEDBYTES crypto_box_curve25519xsalsa20poly1305_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_box_seedbytes(void);
+size_t  crypto_box_seedbytes (void);
 
-#define crypto_box_PUBLICKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_PUBLICKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_publickeybytes(void);
+size_t  crypto_box_publickeybytes (void);
 
-#define crypto_box_SECRETKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_SECRETKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_secretkeybytes(void);
+size_t  crypto_box_secretkeybytes (void);
 
 #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_box_noncebytes(void);
+size_t  crypto_box_noncebytes (void);
 
 #define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_box_macbytes(void);
+size_t  crypto_box_macbytes (void);
 
-#define crypto_box_MESSAGEBYTES_MAX 
crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_box_MESSAGEBYTES_MAX \
+  crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_box_messagebytes_max(void);
+size_t  crypto_box_messagebytes_max (void);
 
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_box_primitive(void);
+const char *crypto_box_primitive (void);
 
 SODIUM_EXPORT
-int crypto_box_seed_keypair(unsigned char *pk, unsigned char *sk,
-                            const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_box_seed_keypair (unsigned char *pk, unsigned char *sk,
+                             const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_easy (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen, const unsigned char *n,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open_easy (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen, const unsigned char *n,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_detached(unsigned char *c, unsigned char *mac,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
+int crypto_box_detached (unsigned char *c, unsigned char *mac,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *n, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
-                             const unsigned char *mac,
-                             unsigned long long clen,
-                             const unsigned char *n,
-                             const unsigned char *pk,
-                             const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+int crypto_box_open_detached (unsigned char *m, const unsigned char *c,
+                              const unsigned char *mac,
+                              unsigned long long clen,
+                              const unsigned char *n,
+                              const unsigned char *pk,
+                              const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
-#define crypto_box_BEFORENMBYTES 
crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_BEFORENMBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
 SODIUM_EXPORT
-size_t  crypto_box_beforenmbytes(void);
+size_t  crypto_box_beforenmbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_beforenm (unsigned char *k, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_box_easy_afternm (unsigned char *c, const unsigned char *m,
+                             unsigned long long mlen, const unsigned char *n,
+                             const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                             4,
+                                                                             
5)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
-                                 unsigned long long clen, const unsigned char 
*n,
-                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_easy_afternm (unsigned char *m, const unsigned char *c,
+                                  unsigned long long clen, const unsigned
+                                  char *n,
+                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
-                                const unsigned char *m, unsigned long long 
mlen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_detached_afternm (unsigned char *c, unsigned char *mac,
+                                 const unsigned char *m, unsigned long long
+                                 mlen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
-                                     const unsigned char *mac,
-                                     unsigned long long clen, const unsigned 
char *n,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_open_detached_afternm (unsigned char *m, const unsigned char *c,
+                                      const unsigned char *mac,
+                                      unsigned long long clen, const unsigned
+                                      char *n,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_SEALBYTES (crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_sealbytes(void);
+size_t crypto_box_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_seal(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_seal (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_seal_open (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_zerobytes(void);
+size_t  crypto_box_zerobytes (void);
 
-#define crypto_box_BOXZEROBYTES 
crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_BOXZEROBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_boxzerobytes(void);
+size_t  crypto_box_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box(unsigned char *c, const unsigned char *m,
-               unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box (unsigned char *c, const unsigned char *m,
+                unsigned long long mlen, const unsigned char *n,
+                const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open(unsigned char *m, const unsigned char *c,
-                    unsigned long long clen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open (unsigned char *m, const unsigned char *c,
+                     unsigned long long clen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_afternm(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen, const unsigned char *n,
-                       const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_box_afternm (unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                        5)));
 
 SODIUM_EXPORT
-int crypto_box_open_afternm(unsigned char *m, const unsigned char *c,
-                            unsigned long long clen, const unsigned char *n,
-                            const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_afternm (unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
index 26a3d31..092da6d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_box_curve25519xchacha20poly1305_H
 #define crypto_box_curve25519xchacha20poly1305_H
 
@@ -15,147 +14,170 @@ extern "C" {
 
 #define crypto_box_curve25519xchacha20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_macbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max (void);
+
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+int crypto_box_curve25519xchacha20poly1305_seed_keypair (unsigned char *pk,
+                                                         unsigned char *sk,
+                                                         const unsigned
+                                                         char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
-                                                        unsigned char *sk,
-                                                        const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_keypair (unsigned char *pk,
+                                                    unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk,
-                                                   unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_easy (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *pk,
+                                                 const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *pk,
-                                                const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_open_easy (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
+int crypto_box_curve25519xchacha20poly1305_detached (unsigned char *c,
+                                                     unsigned char *mac,
+                                                     const unsigned char *m,
+                                                     unsigned long long mlen,
                                                      const unsigned char *n,
                                                      const unsigned char *pk,
                                                      const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c,
-                                                    unsigned char *mac,
-                                                    const unsigned char *m,
-                                                    unsigned long long mlen,
-                                                    const unsigned char *n,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m,
-                                                         const unsigned char 
*c,
-                                                         const unsigned char 
*mac,
-                                                         unsigned long long 
clen,
-                                                         const unsigned char 
*n,
-                                                         const unsigned char 
*pk,
-                                                         const unsigned char 
*sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached (unsigned char *m,
+                                                          const unsigned
+                                                          char *c,
+                                                          const unsigned
+                                                          char *mac,
+                                                          unsigned long long
+                                                          clen,
+                                                          const unsigned
+                                                          char *n,
+                                                          const unsigned
+                                                          char *pk,
+                                                          const unsigned
+                                                          char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char *n,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m,
-                                                             const unsigned 
char *c,
-                                                             unsigned long 
long clen,
-                                                             const unsigned 
char *n,
-                                                             const unsigned 
char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c,
-                                                            unsigned char *mac,
-                                                            const unsigned 
char *m,
-                                                            unsigned long long 
mlen,
-                                                            const unsigned 
char *n,
-                                                            const unsigned 
char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_curve25519xchacha20poly1305_beforenm (unsigned char *k,
+                                                     const unsigned char *pk,
+                                                     const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char 
*m,
-                                                                 const 
unsigned char *c,
-                                                                 const 
unsigned char *mac,
-                                                                 unsigned long 
long clen,
-                                                                 const 
unsigned char *n,
-                                                                 const 
unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_easy_afternm (unsigned char *c,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned char 
*n,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_easy_afternm (unsigned char *m,
+                                                              const unsigned
+                                                              char *c,
+                                                              unsigned long 
long
+                                                              clen,
+                                                              const unsigned
+                                                              char *n,
+                                                              const unsigned
+                                                              char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_detached_afternm (unsigned char *c,
+                                                             unsigned char 
*mac,
+                                                             const unsigned
+                                                             char *m,
+                                                             unsigned long long
+                                                             mlen,
+                                                             const unsigned
+                                                             char *n,
+                                                             const unsigned
+                                                             char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached_afternm (unsigned
+                                                                  char *m,
+                                                                  const 
unsigned
+                                                                  char *c,
+                                                                  const 
unsigned
+                                                                  char *mac,
+                                                                  unsigned long
+                                                                  long clen,
+                                                                  const 
unsigned
+                                                                  char *n,
+                                                                  const 
unsigned
+                                                                  char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_curve25519xchacha20poly1305_SEALBYTES \
-    (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES + \
-     crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES   \
+   + crypto_box_curve25519xchacha20poly1305_MACBYTES)
 
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_sealbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_curve25519xchacha20poly1305_seal (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal_open(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
-                                                     const unsigned char *pk,
-                                                     const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xchacha20poly1305_seal_open (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index e733f49..32e6b32 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -14,96 +14,98 @@ extern "C" {
 
 #define crypto_box_curve25519xsalsa20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair (unsigned char *pk,
+                                                        unsigned char *sk,
+                                                        const unsigned
+                                                        char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_keypair (unsigned char *pk,
+                                                   unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_beforenm (unsigned char *k,
+                                                    const unsigned char *pk,
+                                                    const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \
-    (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_zerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *n,
-                                          const unsigned char *pk,
-                                          const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305 (unsigned char *c,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *n,
+                                           const unsigned char *pk,
+                                           const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *n,
-                                               const unsigned char *pk,
-                                               const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305_open (unsigned char *m,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *n,
+                                                const unsigned char *pk,
+                                                const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *n,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_box_curve25519xsalsa20poly1305_afternm (unsigned char *c,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *n,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char *n,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xsalsa20poly1305_open_afternm (unsigned char *m,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned char *n,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ed25519.h
index dcc46a6..78800dc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ed25519.h
@@ -10,88 +10,92 @@ extern "C" {
 
 #define crypto_core_ed25519_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_bytes(void);
+size_t crypto_core_ed25519_bytes (void);
 
 #define crypto_core_ed25519_UNIFORMBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_uniformbytes(void);
+size_t crypto_core_ed25519_uniformbytes (void);
 
 #define crypto_core_ed25519_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_hashbytes(void);
+size_t crypto_core_ed25519_hashbytes (void);
 
 #define crypto_core_ed25519_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_scalarbytes(void);
+size_t crypto_core_ed25519_scalarbytes (void);
 
 #define crypto_core_ed25519_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_nonreducedscalarbytes(void);
+size_t crypto_core_ed25519_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ed25519_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_add(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_add (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_sub(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_sub (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_from_uniform (unsigned char *p, const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h)
-            __attribute__ ((nonnull)) __attribute__ ((deprecated));
+int crypto_core_ed25519_from_hash (unsigned char *p, const unsigned char *h)
+__attribute__ ((nonnull)) __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_scalar_invert(unsigned char *recip, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_scalar_invert (unsigned char *recip, const unsigned
+                                       char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_negate(unsigned char *neg, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_negate (unsigned char *neg, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_complement(unsigned char *comp, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_complement (unsigned char *comp, const unsigned
+                                            char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_add(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_add (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_sub(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_sub (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_mul(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_mul (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_reduce(unsigned char *r, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_reduce (unsigned char *r, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hchacha20.h
index ece141b..692f833 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hchacha20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hchacha20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_outputbytes(void);
+size_t crypto_core_hchacha20_outputbytes (void);
 
 #define crypto_core_hchacha20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_inputbytes(void);
+size_t crypto_core_hchacha20_inputbytes (void);
 
 #define crypto_core_hchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_keybytes(void);
+size_t crypto_core_hchacha20_keybytes (void);
 
 #define crypto_core_hchacha20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_constbytes(void);
+size_t crypto_core_hchacha20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hchacha20 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hsalsa20.h
index 4bf7a48..67ecdab 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_hsalsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_outputbytes(void);
+size_t crypto_core_hsalsa20_outputbytes (void);
 
 #define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_inputbytes(void);
+size_t crypto_core_hsalsa20_inputbytes (void);
 
 #define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_keybytes(void);
+size_t crypto_core_hsalsa20_keybytes (void);
 
 #define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_constbytes(void);
+size_t crypto_core_hsalsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hsalsa20 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ristretto255.h
index f2820e5..053957a 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_ristretto255.h
@@ -10,88 +10,90 @@ extern "C" {
 
 #define crypto_core_ristretto255_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_bytes(void);
+size_t crypto_core_ristretto255_bytes (void);
 
 #define crypto_core_ristretto255_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_hashbytes(void);
+size_t crypto_core_ristretto255_hashbytes (void);
 
 #define crypto_core_ristretto255_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_scalarbytes(void);
+size_t crypto_core_ristretto255_scalarbytes (void);
 
 #define crypto_core_ristretto255_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_nonreducedscalarbytes(void);
+size_t crypto_core_ristretto255_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_add(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_add (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_sub(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_sub (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_from_hash(unsigned char *p,
-                                       const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_from_hash (unsigned char *p,
+                                        const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_scalar_invert(unsigned char *recip,
-                                           const unsigned char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_scalar_invert (unsigned char *recip,
+                                            const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_negate(unsigned char *neg,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_negate (unsigned char *neg,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_complement(unsigned char *comp,
-                                                const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_complement (unsigned char *comp,
+                                                 const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_add(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_add (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_sub(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_sub (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_mul(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_mul (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_reduce(unsigned char *r,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_reduce (unsigned char *r,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa20.h
index bd79fd9..ffea366 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_outputbytes(void);
+size_t crypto_core_salsa20_outputbytes (void);
 
 #define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_inputbytes(void);
+size_t crypto_core_salsa20_inputbytes (void);
 
 #define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_keybytes(void);
+size_t crypto_core_salsa20_keybytes (void);
 
 #define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_constbytes(void);
+size_t crypto_core_salsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
-                        const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa20 (unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa2012.h
index 0595759..70740ac 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa2012.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_outputbytes(void);
+size_t crypto_core_salsa2012_outputbytes (void);
 
 #define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_inputbytes(void);
+size_t crypto_core_salsa2012_inputbytes (void);
 
 #define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_keybytes(void);
+size_t crypto_core_salsa2012_keybytes (void);
 
 #define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_constbytes(void);
+size_t crypto_core_salsa2012_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa2012 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa208.h
index d2f216a..fb91b43 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_core_salsa208.h
@@ -10,28 +10,28 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_outputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_inputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_constbytes (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa208 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash.h
index d897e5d..afe7a1e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash.h
@@ -15,31 +15,31 @@ extern "C" {
 
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_min(void);
+size_t  crypto_generichash_bytes_min (void);
 
 #define crypto_generichash_BYTES_MAX crypto_generichash_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_max(void);
+size_t  crypto_generichash_bytes_max (void);
 
 #define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
+size_t  crypto_generichash_bytes (void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_min(void);
+size_t  crypto_generichash_keybytes_min (void);
 
 #define crypto_generichash_KEYBYTES_MAX crypto_generichash_blake2b_KEYBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_max(void);
+size_t  crypto_generichash_keybytes_max (void);
 
 #define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_keybytes (void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_generichash_primitive(void);
+const char *crypto_generichash_primitive (void);
 
 /*
  * Important when writing bindings for other programming languages:
@@ -48,34 +48,34 @@ const char *crypto_generichash_primitive(void);
 typedef crypto_generichash_blake2b_state crypto_generichash_state;
 
 SODIUM_EXPORT
-size_t  crypto_generichash_statebytes(void);
+size_t  crypto_generichash_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash(unsigned char *out, size_t outlen,
-                       const unsigned char *in, unsigned long long inlen,
-                       const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash (unsigned char *out, size_t outlen,
+                        const unsigned char *in, unsigned long long inlen,
+                        const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_init(crypto_generichash_state *state,
-                            const unsigned char *key,
-                            const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_init (crypto_generichash_state *state,
+                             const unsigned char *key,
+                             const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_update(crypto_generichash_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_update (crypto_generichash_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_final(crypto_generichash_state *state,
-                             unsigned char *out, const size_t outlen)
-            __attribute__ ((nonnull));
+int crypto_generichash_final (crypto_generichash_state *state,
+                              unsigned char *out, const size_t outlen)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_keygen (unsigned char k[crypto_generichash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash_blake2b.h
index ae3b52f..e0e4462 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_generichash_blake2b.h
@@ -22,8 +22,9 @@ extern "C" {
 # pragma pack(push, 1)
 #endif
 
-typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state {
-    unsigned char opaque[384];
+typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state
+{
+  unsigned char opaque[384];
 } crypto_generichash_blake2b_state;
 
 #ifdef __IBMC__
@@ -36,84 +37,89 @@ typedef struct CRYPTO_ALIGN(64) 
crypto_generichash_blake2b_state {
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_min(void);
+size_t crypto_generichash_blake2b_bytes_min (void);
 
 #define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_max(void);
+size_t crypto_generichash_blake2b_bytes_max (void);
 
 #define crypto_generichash_blake2b_BYTES         32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes(void);
+size_t crypto_generichash_blake2b_bytes (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_min(void);
+size_t crypto_generichash_blake2b_keybytes_min (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_max(void);
+size_t crypto_generichash_blake2b_keybytes_max (void);
 
 #define crypto_generichash_blake2b_KEYBYTES      32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes(void);
+size_t crypto_generichash_blake2b_keybytes (void);
 
 #define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_saltbytes(void);
+size_t crypto_generichash_blake2b_saltbytes (void);
 
 #define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_personalbytes(void);
+size_t crypto_generichash_blake2b_personalbytes (void);
 
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_statebytes(void);
+size_t crypto_generichash_blake2b_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
-                               const unsigned char *in,
-                               unsigned long long inlen,
-                               const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b (unsigned char *out, size_t outlen,
+                                const unsigned char *in,
+                                unsigned long long inlen,
+                                const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
-                                             const unsigned char *in,
-                                             unsigned long long inlen,
-                                             const unsigned char *key,
-                                             size_t keylen,
-                                             const unsigned char *salt,
-                                             const unsigned char *personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_salt_personal (unsigned char *out, size_t 
outlen,
+                                              const unsigned char *in,
+                                              unsigned long long inlen,
+                                              const unsigned char *key,
+                                              size_t keylen,
+                                              const unsigned char *salt,
+                                              const unsigned char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
-                                    const unsigned char *key,
-                                    const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init (crypto_generichash_blake2b_state *state,
+                                     const unsigned char *key,
+                                     const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int 
crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state 
*state,
-                                                  const unsigned char *key,
-                                                  const size_t keylen, const 
size_t outlen,
-                                                  const unsigned char *salt,
-                                                  const unsigned char 
*personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init_salt_personal (
+  crypto_generichash_blake2b_state *state,
+  const unsigned char *key,
+  const size_t keylen, const
+  size_t outlen,
+  const unsigned char *salt,
+  const unsigned
+  char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
-                                      const unsigned char *in,
-                                      unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_update (crypto_generichash_blake2b_state *state,
+                                       const unsigned char *in,
+                                       unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
-                                     unsigned char *out,
-                                     const size_t outlen) __attribute__ 
((nonnull));
+int crypto_generichash_blake2b_final (crypto_generichash_blake2b_state *state,
+                                      unsigned char *out,
+                                      const size_t outlen) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_blake2b_keygen(unsigned char 
k[crypto_generichash_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_blake2b_keygen (unsigned char
+                                        k[crypto_generichash_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash.h
index 767d548..a0ac1fe 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash.h
@@ -22,16 +22,16 @@ extern "C" {
 
 #define crypto_hash_BYTES crypto_hash_sha512_BYTES
 SODIUM_EXPORT
-size_t crypto_hash_bytes(void);
+size_t crypto_hash_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 #define crypto_hash_PRIMITIVE "sha512"
 SODIUM_EXPORT
-const char *crypto_hash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_hash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha256.h
index c47982a..2adabae 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha256.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha256_state {
-    uint32_t state[8];
-    uint64_t count;
-    uint8_t  buf[64];
+typedef struct crypto_hash_sha256_state
+{
+  uint32_t state[8];
+  uint64_t count;
+  uint8_t buf[64];
 } crypto_hash_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha256_statebytes(void);
+size_t crypto_hash_sha256_statebytes (void);
 
 #define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_hash_sha256_bytes(void);
+size_t crypto_hash_sha256_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha256 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_init(crypto_hash_sha256_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_init (crypto_hash_sha256_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha256_update (crypto_hash_sha256_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_final (crypto_hash_sha256_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha512.h
index 5b690fb..b9618a7 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_hash_sha512.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha512_state {
-    uint64_t state[8];
-    uint64_t count[2];
-    uint8_t  buf[128];
+typedef struct crypto_hash_sha512_state
+{
+  uint64_t state[8];
+  uint64_t count[2];
+  uint8_t buf[128];
 } crypto_hash_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha512_statebytes(void);
+size_t crypto_hash_sha512_statebytes (void);
 
 #define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_hash_sha512_bytes(void);
+size_t crypto_hash_sha512_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha512 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_init(crypto_hash_sha512_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_init (crypto_hash_sha512_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha512_update (crypto_hash_sha512_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_final (crypto_hash_sha512_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf.h
index ac2fc61..f083146 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf.h
@@ -16,35 +16,35 @@ extern "C" {
 
 #define crypto_kdf_BYTES_MIN crypto_kdf_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_min(void);
+size_t crypto_kdf_bytes_min (void);
 
 #define crypto_kdf_BYTES_MAX crypto_kdf_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_max(void);
+size_t crypto_kdf_bytes_max (void);
 
 #define crypto_kdf_CONTEXTBYTES crypto_kdf_blake2b_CONTEXTBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_contextbytes(void);
+size_t crypto_kdf_contextbytes (void);
 
 #define crypto_kdf_KEYBYTES crypto_kdf_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_keybytes(void);
+size_t crypto_kdf_keybytes (void);
 
 #define crypto_kdf_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_kdf_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_kdf_primitive (void)
+__attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int crypto_kdf_derive_from_key(unsigned char *subkey, size_t subkey_len,
-                               uint64_t subkey_id,
-                               const char ctx[crypto_kdf_CONTEXTBYTES],
-                               const unsigned char key[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_derive_from_key (unsigned char *subkey, size_t subkey_len,
+                                uint64_t subkey_id,
+                                const char ctx[crypto_kdf_CONTEXTBYTES],
+                                const unsigned char key[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_kdf_keygen(unsigned char k[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_keygen (unsigned char k[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_blake2b.h
index 489c7c2..a2f287e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_blake2b.h
@@ -16,26 +16,29 @@ extern "C" {
 
 #define crypto_kdf_blake2b_BYTES_MIN 16
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_min(void);
+size_t crypto_kdf_blake2b_bytes_min (void);
 
 #define crypto_kdf_blake2b_BYTES_MAX 64
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_max(void);
+size_t crypto_kdf_blake2b_bytes_max (void);
 
 #define crypto_kdf_blake2b_CONTEXTBYTES 8
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_contextbytes(void);
+size_t crypto_kdf_blake2b_contextbytes (void);
 
 #define crypto_kdf_blake2b_KEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_keybytes(void);
+size_t crypto_kdf_blake2b_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_blake2b_derive_from_key(unsigned char *subkey, size_t 
subkey_len,
-                                       uint64_t subkey_id,
-                                       const char 
ctx[crypto_kdf_blake2b_CONTEXTBYTES],
-                                       const unsigned char 
key[crypto_kdf_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_blake2b_derive_from_key (unsigned char *subkey, size_t
+                                        subkey_len,
+                                        uint64_t subkey_id,
+                                        const char
+                                        ctx[crypto_kdf_blake2b_CONTEXTBYTES],
+                                        const unsigned char
+                                        key[crypto_kdf_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha256.h
index e7e7f4d..39ba301 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha256.h
@@ -18,54 +18,61 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha256_KEYBYTES crypto_auth_hmacsha256_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_keybytes(void);
+size_t crypto_kdf_hkdf_sha256_keybytes (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_min(void);
+size_t crypto_kdf_hkdf_sha256_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MAX (0xff * crypto_auth_hmacsha256_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_max(void);
+size_t crypto_kdf_hkdf_sha256_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(4)));
+int crypto_kdf_hkdf_sha256_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(4)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha256_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
+void crypto_kdf_hkdf_sha256_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha256_state {
-    crypto_auth_hmacsha256_state st;
+typedef struct crypto_kdf_hkdf_sha256_state
+{
+  crypto_auth_hmacsha256_state st;
 } crypto_kdf_hkdf_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_statebytes(void);
+size_t crypto_kdf_hkdf_sha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_init(crypto_kdf_hkdf_sha256_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_extract_init (crypto_kdf_hkdf_sha256_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_update(crypto_kdf_hkdf_sha256_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_update (crypto_kdf_hkdf_sha256_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_final(crypto_kdf_hkdf_sha256_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_final (crypto_kdf_hkdf_sha256_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha512.h
index 0ed205d..bfcabdb 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kdf_hkdf_sha512.h
@@ -18,55 +18,62 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha512_KEYBYTES crypto_auth_hmacsha512_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_keybytes(void);
+size_t crypto_kdf_hkdf_sha512_keybytes (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_min(void);
+size_t crypto_kdf_hkdf_sha512_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MAX (0xff * crypto_auth_hmacsha512_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_max(void);
+size_t crypto_kdf_hkdf_sha512_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha512_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_hkdf_sha512_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha512_state {
-    crypto_auth_hmacsha512_state st;
+typedef struct crypto_kdf_hkdf_sha512_state
+{
+  crypto_auth_hmacsha512_state st;
 } crypto_kdf_hkdf_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_statebytes(void);
+size_t crypto_kdf_hkdf_sha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_init(crypto_kdf_hkdf_sha512_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract_init (crypto_kdf_hkdf_sha512_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_update(crypto_kdf_hkdf_sha512_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_update (crypto_kdf_hkdf_sha512_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_final(crypto_kdf_hkdf_sha512_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_final (crypto_kdf_hkdf_sha512_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kx.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kx.h
index 347132c..2227064 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kx.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_kx.h
@@ -14,50 +14,56 @@ extern "C" {
 
 #define crypto_kx_PUBLICKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_publickeybytes(void);
+size_t crypto_kx_publickeybytes (void);
 
 #define crypto_kx_SECRETKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_secretkeybytes(void);
+size_t crypto_kx_secretkeybytes (void);
 
 #define crypto_kx_SEEDBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_seedbytes(void);
+size_t crypto_kx_seedbytes (void);
 
 #define crypto_kx_SESSIONKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_sessionkeybytes(void);
+size_t crypto_kx_sessionkeybytes (void);
 
 #define crypto_kx_PRIMITIVE "x25519blake2b"
 SODIUM_EXPORT
-const char *crypto_kx_primitive(void);
+const char *crypto_kx_primitive (void);
 
 SODIUM_EXPORT
-int crypto_kx_seed_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                           unsigned char sk[crypto_kx_SECRETKEYBYTES],
-                           const unsigned char seed[crypto_kx_SEEDBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_seed_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                            unsigned char sk[crypto_kx_SECRETKEYBYTES],
+                            const unsigned char seed[crypto_kx_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                      unsigned char sk[crypto_kx_SECRETKEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                       unsigned char sk[crypto_kx_SECRETKEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_client_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
client_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_client_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   client_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_kx_server_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
server_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_server_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   server_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth.h
index 7cd7b07..25ada13 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth.h
@@ -16,47 +16,48 @@ extern "C" {
 typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
 
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_statebytes(void);
+size_t  crypto_onetimeauth_statebytes (void);
 
 #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_bytes(void);
+size_t  crypto_onetimeauth_bytes (void);
 
 #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_keybytes(void);
+size_t  crypto_onetimeauth_keybytes (void);
 
 #define crypto_onetimeauth_PRIMITIVE "poly1305"
 SODIUM_EXPORT
-const char *crypto_onetimeauth_primitive(void);
+const char *crypto_onetimeauth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_verify(const unsigned char *h, const unsigned char *in,
-                              unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_verify (const unsigned char *h, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_init(crypto_onetimeauth_state *state,
-                            const unsigned char *key) __attribute__ 
((nonnull));
+int crypto_onetimeauth_init (crypto_onetimeauth_state *state,
+                             const unsigned char *key) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_update(crypto_onetimeauth_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_update (crypto_onetimeauth_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_final(crypto_onetimeauth_state *state,
-                             unsigned char *out) __attribute__ ((nonnull));
+int crypto_onetimeauth_final (crypto_onetimeauth_state *state,
+                              unsigned char *out) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_keygen (unsigned char k[crypto_onetimeauth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth_poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth_poly1305.h
index 1565d37..027107c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth_poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_onetimeauth_poly1305.h
@@ -16,54 +16,57 @@
 extern "C" {
 #endif
 
-typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state {
-    unsigned char opaque[256];
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+  unsigned char opaque[256];
 } crypto_onetimeauth_poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_statebytes(void);
+size_t crypto_onetimeauth_poly1305_statebytes (void);
 
 #define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_bytes(void);
+size_t crypto_onetimeauth_poly1305_bytes (void);
 
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_keybytes(void);
+size_t crypto_onetimeauth_poly1305_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305(unsigned char *out,
-                                const unsigned char *in,
-                                unsigned long long inlen,
-                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth_poly1305 (unsigned char *out,
+                                 const unsigned char *in,
+                                 unsigned long long inlen,
+                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_verify(const unsigned char *h,
-                                       const unsigned char *in,
-                                       unsigned long long inlen,
-                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_poly1305_verify (const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long inlen,
+                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
-                                     const unsigned char *key)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_init (crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state 
*state,
-                                       const unsigned char *in,
-                                       unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_poly1305_update (
+  crypto_onetimeauth_poly1305_state *state,
+  const unsigned char *in,
+  unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
-                                      unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_final (crypto_onetimeauth_poly1305_state 
*state,
+                                       unsigned char *out)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_poly1305_keygen(unsigned char 
k[crypto_onetimeauth_poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_poly1305_keygen (unsigned char
+                                         
k[crypto_onetimeauth_poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash.h
index 9683192..7e0ee9c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash.h
@@ -16,83 +16,87 @@ extern "C" {
 
 #define crypto_pwhash_ALG_ARGON2I13 crypto_pwhash_argon2i_ALG_ARGON2I13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2i13(void);
+int crypto_pwhash_alg_argon2i13 (void);
 
 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2id13(void);
+int crypto_pwhash_alg_argon2id13 (void);
 
 #define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_default(void);
+int crypto_pwhash_alg_default (void);
 
 #define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_min(void);
+size_t crypto_pwhash_bytes_min (void);
 
 #define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_max(void);
+size_t crypto_pwhash_bytes_max (void);
 
 #define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_min(void);
+size_t crypto_pwhash_passwd_min (void);
 
 #define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_max(void);
+size_t crypto_pwhash_passwd_max (void);
 
 #define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_saltbytes(void);
+size_t crypto_pwhash_saltbytes (void);
 
 #define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_strbytes(void);
+size_t crypto_pwhash_strbytes (void);
 
 #define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
-const char *crypto_pwhash_strprefix(void);
+const char *crypto_pwhash_strprefix (void);
 
 #define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_min(void);
+size_t crypto_pwhash_opslimit_min (void);
 
 #define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_max(void);
+size_t crypto_pwhash_opslimit_max (void);
 
 #define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_min(void);
+size_t crypto_pwhash_memlimit_min (void);
 
 #define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_max(void);
+size_t crypto_pwhash_memlimit_max (void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_interactive(void);
+size_t crypto_pwhash_opslimit_interactive (void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_interactive(void);
+size_t crypto_pwhash_memlimit_interactive (void);
 
 #define crypto_pwhash_OPSLIMIT_MODERATE 
crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_moderate(void);
+size_t crypto_pwhash_opslimit_moderate (void);
 
 #define crypto_pwhash_MEMLIMIT_MODERATE 
crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_moderate(void);
+size_t crypto_pwhash_memlimit_moderate (void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE 
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_sensitive(void);
+size_t crypto_pwhash_opslimit_sensitive (void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE 
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_sensitive(void);
+size_t crypto_pwhash_memlimit_sensitive (void);
 
 /*
  * With this function, do not forget to store all parameters, including the
@@ -101,11 +105,11 @@ size_t crypto_pwhash_memlimit_sensitive(void);
  * may change.
  */
 SODIUM_EXPORT
-int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
-                  const char * const passwd, unsigned long long passwdlen,
-                  const unsigned char * const salt,
-                  unsigned long long opslimit, size_t memlimit, int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash (unsigned char *const out, unsigned long long outlen,
+                   const char *const passwd, unsigned long long passwdlen,
+                   const unsigned char *const salt,
+                   unsigned long long opslimit, size_t memlimit, int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /*
  * The output string already includes all the required parameters, including
@@ -113,32 +117,35 @@ int crypto_pwhash(unsigned char * const out, unsigned 
long long outlen,
  * order to verify a password.
  */
 SODIUM_EXPORT
-int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
-                      const char * const passwd, unsigned long long passwdlen,
-                      unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str (char out[crypto_pwhash_STRBYTES],
+                       const char *const passwd, unsigned long long passwdlen,
+                       unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
-                          const char * const passwd, unsigned long long 
passwdlen,
-                          unsigned long long opslimit, size_t memlimit, int 
alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_alg (char out[crypto_pwhash_STRBYTES],
+                           const char *const passwd, unsigned long long
+                           passwdlen,
+                           unsigned long long opslimit, size_t memlimit, int
+                           alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_verify(const char *str,
-                             const char * const passwd,
-                             unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_verify (const char *str,
+                              const char *const passwd,
+                              unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_needs_rehash(const char *str,
-                                   unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_needs_rehash (const char *str,
+                                    unsigned long long opslimit, size_t
+                                    memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
-const char *crypto_pwhash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_pwhash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2i.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2i.h
index 63abdf4..65b2bc4 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2i.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2i.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2i_ALG_ARGON2I13 1
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_alg_argon2i13(void);
+int crypto_pwhash_argon2i_alg_argon2i13 (void);
 
 #define crypto_pwhash_argon2i_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_min(void);
+size_t crypto_pwhash_argon2i_bytes_min (void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                    4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_max(void);
+size_t crypto_pwhash_argon2i_bytes_max (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_min(void);
+size_t crypto_pwhash_argon2i_passwd_min (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_max(void);
+size_t crypto_pwhash_argon2i_passwd_max (void);
 
 #define crypto_pwhash_argon2i_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_saltbytes(void);
+size_t crypto_pwhash_argon2i_saltbytes (void);
 
 #define crypto_pwhash_argon2i_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_strbytes(void);
+size_t crypto_pwhash_argon2i_strbytes (void);
 
 #define crypto_pwhash_argon2i_STRPREFIX "$argon2i$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2i_strprefix(void);
+const char *crypto_pwhash_argon2i_strprefix (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MIN 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_min(void);
+size_t crypto_pwhash_argon2i_opslimit_min (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_max(void);
+size_t crypto_pwhash_argon2i_opslimit_max (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_min(void);
+size_t crypto_pwhash_argon2i_memlimit_min (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_max(void);
+size_t crypto_pwhash_argon2i_memlimit_max (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_interactive(void);
+size_t crypto_pwhash_argon2i_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_interactive(void);
+size_t crypto_pwhash_argon2i_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MODERATE 6U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_moderate(void);
+size_t crypto_pwhash_argon2i_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MODERATE 134217728U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_moderate(void);
+size_t crypto_pwhash_argon2i_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE 8U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2i_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE 536870912U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2i_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i(unsigned char * const out,
-                          unsigned long long outlen,
-                          const char * const passwd,
-                          unsigned long long passwdlen,
-                          const unsigned char * const salt,
-                          unsigned long long opslimit, size_t memlimit,
-                          int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i (unsigned char *const out,
+                           unsigned long long outlen,
+                           const char *const passwd,
+                           unsigned long long passwdlen,
+                           const unsigned char *const salt,
+                           unsigned long long opslimit, size_t memlimit,
+                           int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str(char out[crypto_pwhash_argon2i_STRBYTES],
-                              const char * const passwd,
-                              unsigned long long passwdlen,
-                              unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str (char out[crypto_pwhash_argon2i_STRBYTES],
+                               const char *const passwd,
+                               unsigned long long passwdlen,
+                               unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_verify(const char * str,
-                                     const char * const passwd,
-                                     unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_verify (const char *str,
+                                      const char *const passwd,
+                                      unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_needs_rehash(const char * str,
-                                           unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_needs_rehash (const char *str,
+                                            unsigned long long opslimit, size_t
+                                            memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2id.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2id.h
index 98bc83e..6a2194f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2id.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_argon2id.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_alg_argon2id13(void);
+int crypto_pwhash_argon2id_alg_argon2id13 (void);
 
 #define crypto_pwhash_argon2id_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_min(void);
+size_t crypto_pwhash_argon2id_bytes_min (void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                     4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_max(void);
+size_t crypto_pwhash_argon2id_bytes_max (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_min(void);
+size_t crypto_pwhash_argon2id_passwd_min (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_max(void);
+size_t crypto_pwhash_argon2id_passwd_max (void);
 
 #define crypto_pwhash_argon2id_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_saltbytes(void);
+size_t crypto_pwhash_argon2id_saltbytes (void);
 
 #define crypto_pwhash_argon2id_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_strbytes(void);
+size_t crypto_pwhash_argon2id_strbytes (void);
 
 #define crypto_pwhash_argon2id_STRPREFIX "$argon2id$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2id_strprefix(void);
+const char *crypto_pwhash_argon2id_strprefix (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MIN 1U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_min(void);
+size_t crypto_pwhash_argon2id_opslimit_min (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_max(void);
+size_t crypto_pwhash_argon2id_opslimit_max (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_min(void);
+size_t crypto_pwhash_argon2id_memlimit_min (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_max(void);
+size_t crypto_pwhash_argon2id_memlimit_max (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE 2U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_interactive(void);
+size_t crypto_pwhash_argon2id_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE 67108864U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_interactive(void);
+size_t crypto_pwhash_argon2id_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MODERATE 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_moderate(void);
+size_t crypto_pwhash_argon2id_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MODERATE 268435456U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_moderate(void);
+size_t crypto_pwhash_argon2id_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2id_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2id_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id(unsigned char * const out,
-                           unsigned long long outlen,
-                           const char * const passwd,
-                           unsigned long long passwdlen,
-                           const unsigned char * const salt,
-                           unsigned long long opslimit, size_t memlimit,
-                           int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id (unsigned char *const out,
+                            unsigned long long outlen,
+                            const char *const passwd,
+                            unsigned long long passwdlen,
+                            const unsigned char *const salt,
+                            unsigned long long opslimit, size_t memlimit,
+                            int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str(char out[crypto_pwhash_argon2id_STRBYTES],
-                               const char * const passwd,
-                               unsigned long long passwdlen,
-                               unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str (char out[crypto_pwhash_argon2id_STRBYTES],
+                                const char *const passwd,
+                                unsigned long long passwdlen,
+                                unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_verify(const char * str,
-                                      const char * const passwd,
-                                      unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_verify (const char *str,
+                                       const char *const passwd,
+                                       unsigned long long passwdlen)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_needs_rehash(const char * str,
-                                            unsigned long long opslimit, 
size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_needs_rehash (const char *str,
+                                             unsigned long long opslimit, 
size_t
+                                             memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
index 8956dfb..ed33309 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
@@ -16,102 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
+  SODIUM_MIN (SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_saltbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_strbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$"
 SODIUM_EXPORT
-const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void);
+const char *crypto_pwhash_scryptsalsa208sha256_strprefix (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MIN 32768U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MIN 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
-    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
+  SODIUM_MIN (SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256(unsigned char * const out,
-                                       unsigned long long outlen,
-                                       const char * const passwd,
-                                       unsigned long long passwdlen,
-                                       const unsigned char * const salt,
-                                       unsigned long long opslimit,
-                                       size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256 (unsigned char *const out,
+                                        unsigned long long outlen,
+                                        const char *const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char *const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str(char 
out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
-                                           const char * const passwd,
-                                           unsigned long long passwdlen,
-                                           unsigned long long opslimit,
-                                           size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str (char
+                                            out[
+                                              
crypto_pwhash_scryptsalsa208sha256_STRBYTES
+                                            ],
+                                            const char *const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_verify(const char * str,
-                                                  const char * const passwd,
-                                                  unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_verify (const char *str,
+                                                   const char *const passwd,
+                                                   unsigned long long 
passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t 
passwdlen,
-                                          const uint8_t * salt, size_t saltlen,
-                                          uint64_t N, uint32_t r, uint32_t p,
-                                          uint8_t * buf, size_t buflen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_ll (const uint8_t *passwd, size_t
+                                           passwdlen,
+                                           const uint8_t *salt, size_t saltlen,
+                                           uint64_t N, uint32_t r, uint32_t p,
+                                           uint8_t *buf, size_t buflen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char * str,
-                                                        unsigned long long 
opslimit,
-                                                        size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash (const char *str,
+                                                         unsigned long long
+                                                         opslimit,
+                                                         size_t memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult.h
index 1c68585..15586d3 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult.h
@@ -12,19 +12,19 @@ extern "C" {
 
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_bytes(void);
+size_t  crypto_scalarmult_bytes (void);
 
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_scalarbytes(void);
+size_t  crypto_scalarmult_scalarbytes (void);
 
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 SODIUM_EXPORT
-const char *crypto_scalarmult_primitive(void);
+const char *crypto_scalarmult_primitive (void);
 
 SODIUM_EXPORT
-int crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -35,9 +35,9 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned 
char *n)
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult(unsigned char *q, const unsigned char *n,
-                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult (unsigned char *q, const unsigned char *n,
+                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_curve25519.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_curve25519.h
index 60e9d0c..9cde57c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_curve25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_curve25519.h
@@ -11,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_curve25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_bytes(void);
+size_t crypto_scalarmult_curve25519_bytes (void);
 
 #define crypto_scalarmult_curve25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_scalarbytes(void);
+size_t crypto_scalarmult_curve25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -26,14 +26,14 @@ size_t crypto_scalarmult_curve25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
-                                 const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519 (unsigned char *q, const unsigned char *n,
+                                  const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519_base(unsigned char *q,
-                                      const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519_base (unsigned char *q,
+                                       const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ed25519.h
index 2dfa4d7..749c0c1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ed25519.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ed25519_H
 #define crypto_scalarmult_ed25519_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ed25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_bytes(void);
+size_t crypto_scalarmult_ed25519_bytes (void);
 
 #define crypto_scalarmult_ed25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_scalarbytes(void);
+size_t crypto_scalarmult_ed25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,22 +26,23 @@ size_t crypto_scalarmult_ed25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519(unsigned char *q, const unsigned char *n,
-                              const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519 (unsigned char *q, const unsigned char *n,
+                               const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_noclamp(unsigned char *q, const unsigned char *n,
-                                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_noclamp (unsigned char *q, const unsigned char 
*n,
+                                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base_noclamp(unsigned char *q, const unsigned 
char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base_noclamp (unsigned char *q, const unsigned
+                                            char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ristretto255.h
index 40a45cc..b1840a1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_scalarmult_ristretto255.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ristretto255_H
 #define crypto_scalarmult_ristretto255_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ristretto255_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_bytes(void);
+size_t crypto_scalarmult_ristretto255_bytes (void);
 
 #define crypto_scalarmult_ristretto255_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_scalarbytes(void);
+size_t crypto_scalarmult_ristretto255_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,14 +26,14 @@ size_t crypto_scalarmult_ristretto255_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255(unsigned char *q, const unsigned char *n,
-                                   const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255 (unsigned char *q, const unsigned char *n,
+                                    const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255_base(unsigned char *q,
-                                        const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255_base (unsigned char *q,
+                                         const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox.h
index 1d3709d..c764617 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox.h
@@ -15,76 +15,80 @@ extern "C" {
 
 #define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_keybytes(void);
+size_t  crypto_secretbox_keybytes (void);
 
 #define crypto_secretbox_NONCEBYTES 
crypto_secretbox_xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_noncebytes(void);
+size_t  crypto_secretbox_noncebytes (void);
 
 #define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_macbytes(void);
+size_t  crypto_secretbox_macbytes (void);
 
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_secretbox_primitive(void);
+const char *crypto_secretbox_primitive (void);
 
-#define crypto_secretbox_MESSAGEBYTES_MAX 
crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_secretbox_MESSAGEBYTES_MAX \
+  crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t crypto_secretbox_messagebytes_max(void);
+size_t crypto_secretbox_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
-                          unsigned long long mlen, const unsigned char *n,
-                          const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_secretbox_easy (unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k) __attribute__ ((nonnull(1, 
4,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
-                               unsigned long long clen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open_easy (unsigned char *m, const unsigned char *c,
+                                unsigned long long clen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
-                              const unsigned char *m,
-                              unsigned long long mlen,
-                              const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_detached (unsigned char *c, unsigned char *mac,
+                               const unsigned char *m,
+                               unsigned long long mlen,
+                               const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_detached(unsigned char *m,
-                                   const unsigned char *c,
-                                   const unsigned char *mac,
-                                   unsigned long long clen,
-                                   const unsigned char *n,
-                                   const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_open_detached (unsigned char *m,
+                                    const unsigned char *c,
+                                    const unsigned char *mac,
+                                    unsigned long long clen,
+                                    const unsigned char *n,
+                                    const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 SODIUM_EXPORT
-void crypto_secretbox_keygen(unsigned char k[crypto_secretbox_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_keygen (unsigned char k[crypto_secretbox_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_zerobytes(void);
+size_t  crypto_secretbox_zerobytes (void);
 
-#define crypto_secretbox_BOXZEROBYTES 
crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+#define crypto_secretbox_BOXZEROBYTES \
+  crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_boxzerobytes(void);
+size_t  crypto_secretbox_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_secretbox(unsigned char *c, const unsigned char *m,
-                     unsigned long long mlen, const unsigned char *n,
-                     const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_secretbox (unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                      5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
-                          unsigned long long clen, const unsigned char *n,
-                          const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open (unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xchacha20poly1305.h
index 6ec674e..509fac9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xchacha20poly1305.h
@@ -14,54 +14,55 @@ extern "C" {
 
 #define crypto_secretbox_xchacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_keybytes(void);
+size_t crypto_secretbox_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
+size_t crypto_secretbox_xchacha20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
+size_t crypto_secretbox_xchacha20poly1305_macbytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_secretbox_xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xchacha20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
-                                            const unsigned char *m,
-                                            unsigned long long mlen,
-                                            const unsigned char *n,
-                                            const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xchacha20poly1305_easy (unsigned char *c,
+                                             const unsigned char *m,
+                                             unsigned long long mlen,
+                                             const unsigned char *n,
+                                             const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_easy(unsigned char *m,
-                                                 const unsigned char *c,
-                                                 unsigned long long clen,
-                                                 const unsigned char *n,
-                                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xchacha20poly1305_open_easy (unsigned char *m,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
-                                                unsigned char *mac,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_xchacha20poly1305_detached (unsigned char *c,
+                                                 unsigned char *mac,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     const unsigned char *mac,
-                                                     unsigned long long clen,
-                                                     const unsigned char *n,
-                                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_xchacha20poly1305_open_detached (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      const unsigned char *mac,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index be0874c..18c9bfc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -14,53 +14,57 @@ extern "C" {
 
 #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_keybytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
-                                      const unsigned char *m,
-                                      unsigned long long mlen,
-                                      const unsigned char *n,
-                                      const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xsalsa20poly1305 (unsigned char *c,
+                                       const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n,
+                                       const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
-                                           const unsigned char *c,
-                                           unsigned long long clen,
-                                           const unsigned char *n,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xsalsa20poly1305_open (unsigned char *m,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *n,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char 
k[crypto_secretbox_xsalsa20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_xsalsa20poly1305_keygen (unsigned char
+                                               k[
+                                                 
crypto_secretbox_xsalsa20poly1305_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretstream_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretstream_xchacha20poly1305.h
index b22e4e9..6b8b135 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretstream_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_secretstream_xchacha20poly1305.h
@@ -15,91 +15,100 @@ extern "C" {
 #endif
 
 #define crypto_secretstream_xchacha20poly1305_ABYTES \
-    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+size_t crypto_secretstream_xchacha20poly1305_abytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
-    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+size_t crypto_secretstream_xchacha20poly1305_headerbytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_KEYBYTES \
-    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+size_t crypto_secretstream_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, 
\
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
               (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
-    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
-     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+  (crypto_secretstream_xchacha20poly1305_TAG_PUSH   \
+   | crypto_secretstream_xchacha20poly1305_TAG_REKEY)
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final (void);
 
-typedef struct crypto_secretstream_xchacha20poly1305_state {
-    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
-    unsigned char _pad[8];
+typedef struct crypto_secretstream_xchacha20poly1305_state
+{
+  unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+  unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+  unsigned char _pad[8];
 } crypto_secretstream_xchacha20poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+size_t crypto_secretstream_xchacha20poly1305_statebytes (void);
 
 SODIUM_EXPORT
 void crypto_secretstream_xchacha20poly1305_keygen
-   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
 int crypto_secretstream_xchacha20poly1305_init_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (crypto_secretstream_xchacha20poly1305_state * state,
+  unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *c, unsigned long long *clen_p,
-    const unsigned char *m, unsigned long long mlen,
-    const unsigned char *ad, unsigned long long adlen, unsigned char tag)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_push (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *c, unsigned long
+  long *clen_p,
+  const unsigned char *m, unsigned
+  long long mlen,
+  const unsigned char *ad,
+  unsigned long long adlen, unsigned char tag)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_init_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    const unsigned char 
header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_secretstream_xchacha20poly1305_init_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  const unsigned char
+  header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char
+  k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
-    const unsigned char *c, unsigned long long clen,
-    const unsigned char *ad, unsigned long long adlen)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *m, unsigned long
+  long *mlen_p, unsigned char *tag_p,
+  const unsigned char *c, unsigned
+  long long clen,
+  const unsigned char *ad,
+  unsigned long long adlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_secretstream_xchacha20poly1305_rekey
-    (crypto_secretstream_xchacha20poly1305_state *state);
+void crypto_secretstream_xchacha20poly1305_rekey (
+  crypto_secretstream_xchacha20poly1305_state *state);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash.h
index fecaa88..399538d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash.h
@@ -15,24 +15,24 @@ extern "C" {
 
 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_bytes(void);
+size_t  crypto_shorthash_bytes (void);
 
 #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_keybytes(void);
+size_t  crypto_shorthash_keybytes (void);
 
 #define crypto_shorthash_PRIMITIVE "siphash24"
 SODIUM_EXPORT
-const char *crypto_shorthash_primitive(void);
+const char *crypto_shorthash_primitive (void);
 
 SODIUM_EXPORT
-int crypto_shorthash(unsigned char *out, const unsigned char *in,
-                     unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash (unsigned char *out, const unsigned char *in,
+                      unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_shorthash_keygen (unsigned char k[crypto_shorthash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash_siphash24.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash_siphash24.h
index 1e6f72a..f179919 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash_siphash24.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_shorthash_siphash24.h
@@ -15,32 +15,35 @@ extern "C" {
 
 #define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_bytes(void);
+size_t crypto_shorthash_siphash24_bytes (void);
 
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_keybytes(void);
+size_t crypto_shorthash_siphash24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
-                               unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphash24 (unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned
+                                char *k)
+__attribute__ ((nonnull(1, 4)));
 
 #ifndef SODIUM_LIBRARY_MINIMAL
 /* -- 128-bit output -- */
 
 #define crypto_shorthash_siphashx24_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_bytes(void);
+size_t crypto_shorthash_siphashx24_bytes (void);
 
 #define crypto_shorthash_siphashx24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_keybytes(void);
+size_t crypto_shorthash_siphashx24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphashx24(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphashx24 (unsigned char *out, const unsigned char *in,
+                                 unsigned long long inlen, const unsigned
+                                 char *k)
+__attribute__ ((nonnull(1, 4)));
+
 #endif
 
 #ifdef __cplusplus
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign.h
index f5fafb1..9879476 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign.h
@@ -23,82 +23,84 @@ extern "C" {
 typedef crypto_sign_ed25519ph_state crypto_sign_state;
 
 SODIUM_EXPORT
-size_t  crypto_sign_statebytes(void);
+size_t  crypto_sign_statebytes (void);
 
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_sign_bytes(void);
+size_t  crypto_sign_bytes (void);
 
 #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_seedbytes(void);
+size_t  crypto_sign_seedbytes (void);
 
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_publickeybytes(void);
+size_t  crypto_sign_publickeybytes (void);
 
 #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_secretkeybytes(void);
+size_t  crypto_sign_secretkeybytes (void);
 
 #define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_sign_messagebytes_max(void);
+size_t  crypto_sign_messagebytes_max (void);
 
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
-const char *crypto_sign_primitive(void);
+const char *crypto_sign_primitive (void);
 
 SODIUM_EXPORT
-int crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                             const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_seed_keypair (unsigned char *pk, unsigned char *sk,
+                              const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-                const unsigned char *m, unsigned long long mlen,
-                const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
+int crypto_sign (unsigned char *sm, unsigned long long *smlen_p,
+                 const unsigned char *m, unsigned long long mlen,
+                 const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                     const unsigned char *sm, unsigned long long smlen,
-                     const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+int crypto_sign_open (unsigned char *m, unsigned long long *mlen_p,
+                      const unsigned char *sm, unsigned long long smlen,
+                      const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                         const unsigned char *m, unsigned long long mlen,
-                         const unsigned char *sk) __attribute__ ((nonnull(1, 
5)));
+int crypto_sign_detached (unsigned char *sig, unsigned long long *siglen_p,
+                          const unsigned char *m, unsigned long long mlen,
+                          const unsigned char *sk) __attribute__ ((nonnull(1,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_sign_verify_detached(const unsigned char *sig,
-                                const unsigned char *m,
-                                unsigned long long mlen,
-                                const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_verify_detached (const unsigned char *sig,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_init(crypto_sign_state *state);
+int crypto_sign_init (crypto_sign_state *state);
 
 SODIUM_EXPORT
-int crypto_sign_update(crypto_sign_state *state,
-                       const unsigned char *m, unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_update (crypto_sign_state *state,
+                        const unsigned char *m, unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                             unsigned long long *siglen_p,
-                             const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_final_create (crypto_sign_state *state, unsigned char *sig,
+                              unsigned long long *siglen_p,
+                              const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_final_verify(crypto_sign_state *state, const unsigned char 
*sig,
-                             const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_final_verify (crypto_sign_state *state, const unsigned
+                              char *sig,
+                              const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_ed25519.h
index 0fdac42..ba08826 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_ed25519.h
@@ -12,110 +12,112 @@
 extern "C" {
 #endif
 
-typedef struct crypto_sign_ed25519ph_state {
-    crypto_hash_sha512_state hs;
+typedef struct crypto_sign_ed25519ph_state
+{
+  crypto_hash_sha512_state hs;
 } crypto_sign_ed25519ph_state;
 
 SODIUM_EXPORT
-size_t crypto_sign_ed25519ph_statebytes(void);
+size_t crypto_sign_ed25519ph_statebytes (void);
 
 #define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_bytes(void);
+size_t crypto_sign_ed25519_bytes (void);
 
 #define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_seedbytes(void);
+size_t crypto_sign_ed25519_seedbytes (void);
 
 #define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_publickeybytes(void);
+size_t crypto_sign_ed25519_publickeybytes (void);
 
 #define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_secretkeybytes(void);
+size_t crypto_sign_ed25519_secretkeybytes (void);
 
-#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - 
crypto_sign_ed25519_BYTES)
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                              - crypto_sign_ed25519_BYTES)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_messagebytes_max(void);
+size_t crypto_sign_ed25519_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *sk)
-            __attribute__ ((nonnull(1, 5)));
+int crypto_sign_ed25519 (unsigned char *sm, unsigned long long *smlen_p,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+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)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((nonnull(1, 5)));
+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)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_ed25519_verify_detached (const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                     const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_seed_keypair (unsigned char *pk, unsigned char *sk,
+                                      const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                         const unsigned char *ed25519_pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519_pk_to_curve25519 (unsigned char *curve25519_pk,
+                                          const unsigned char *ed25519_pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                         const unsigned char *ed25519_sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_curve25519 (unsigned char *curve25519_sk,
+                                          const unsigned char *ed25519_sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_seed(unsigned char *seed,
-                                   const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_seed (unsigned char *seed,
+                                    const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_pk (unsigned char *pk, const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_init (crypto_sign_ed25519ph_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                                 const unsigned char *m,
-                                 unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_ed25519ph_update (crypto_sign_ed25519ph_state *state,
+                                  const unsigned char *m,
+                                  unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                       unsigned char *sig,
-                                       unsigned long long *siglen_p,
-                                       const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_ed25519ph_final_create (crypto_sign_ed25519ph_state *state,
+                                        unsigned char *sig,
+                                        unsigned long long *siglen_p,
+                                        const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                       const unsigned char *sig,
-                                       const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_final_verify (crypto_sign_ed25519ph_state *state,
+                                        const unsigned char *sig,
+                                        const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_edwards25519sha512batch.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_edwards25519sha512batch.h
index eed158a..bcfba7b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -25,28 +25,30 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
-#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX 
- crypto_sign_edwards25519sha512batch_BYTES)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                                              - \
+                                                              
crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *sm,
-                                        unsigned long long *smlen_p,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
+int crypto_sign_edwards25519sha512batch (unsigned char *sm,
+                                         unsigned long long *smlen_p,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
+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)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                                unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_sign_edwards25519sha512batch_keypair (unsigned char *pk,
+                                                 unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream.h
index 88dab5f..c8efcdc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream.h
@@ -23,34 +23,34 @@ extern "C" {
 
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_keybytes(void);
+size_t  crypto_stream_keybytes (void);
 
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_noncebytes(void);
+size_t  crypto_stream_noncebytes (void);
 
 #define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_stream_messagebytes_max(void);
+size_t  crypto_stream_messagebytes_max (void);
 
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
-const char *crypto_stream_primitive(void);
+const char *crypto_stream_primitive (void);
 
 SODIUM_EXPORT
-int crypto_stream(unsigned char *c, unsigned long long clen,
-                  const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream (unsigned char *c, unsigned long long clen,
+                   const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xor(unsigned char *c, const unsigned char *m,
-                      unsigned long long mlen, const unsigned char *n,
-                      const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xor (unsigned char *c, const unsigned char *m,
+                       unsigned long long mlen, const unsigned char *n,
+                       const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_keygen (unsigned char k[crypto_stream_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_chacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_chacha20.h
index 4088975..e276a7d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_chacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_chacha20.h
@@ -22,82 +22,89 @@ extern "C" {
 
 #define crypto_stream_chacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_keybytes(void);
+size_t crypto_stream_chacha20_keybytes (void);
 
 #define crypto_stream_chacha20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_noncebytes(void);
+size_t crypto_stream_chacha20_noncebytes (void);
 
 #define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_messagebytes_max(void);
+size_t crypto_stream_chacha20_messagebytes_max (void);
 
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
-int crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_keygen(unsigned char 
k[crypto_stream_chacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_keygen (unsigned char
+                                    k[crypto_stream_chacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
 
 #define crypto_stream_chacha20_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_keybytes(void);
+size_t crypto_stream_chacha20_ietf_keybytes (void);
 
 #define crypto_stream_chacha20_ietf_NONCEBYTES 12U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_noncebytes(void);
+size_t crypto_stream_chacha20_ietf_noncebytes (void);
 
 #define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+  SODIUM_MIN (SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+size_t crypto_stream_chacha20_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf (unsigned char *c, unsigned long long clen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
-                                    unsigned long long mlen, const unsigned 
char *n,
-                                    const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor (unsigned char *c, const unsigned char *m,
+                                     unsigned long long mlen, const unsigned
+                                     char *n,
+                                     const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char 
*m,
-                                       unsigned long long mlen,
-                                       const unsigned char *n, uint32_t ic,
-                                       const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor_ic (unsigned char *c, const unsigned
+                                        char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *n, uint32_t ic,
+                                        const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_ietf_keygen(unsigned char 
k[crypto_stream_chacha20_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_ietf_keygen (unsigned char
+                                         
k[crypto_stream_chacha20_ietf_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_stream_chacha20_IETF_KEYBYTES 
crypto_stream_chacha20_ietf_KEYBYTES
-#define crypto_stream_chacha20_IETF_NONCEBYTES 
crypto_stream_chacha20_ietf_NONCEBYTES
-#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX 
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+#define crypto_stream_chacha20_IETF_KEYBYTES \
+  crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES \
+  crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX \
+  crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa20.h
index 45b3b3e..e677477 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_keybytes(void);
+size_t crypto_stream_salsa20_keybytes (void);
 
 #define crypto_stream_salsa20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_noncebytes(void);
+size_t crypto_stream_salsa20_noncebytes (void);
 
 #define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_messagebytes_max(void);
+size_t crypto_stream_salsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
-                          const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20 (unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
-                              unsigned long long mlen, const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor (unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                 unsigned long long mlen,
-                                 const unsigned char *n, uint64_t ic,
-                                 const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa20_keygen(unsigned char 
k[crypto_stream_salsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa20_keygen (unsigned char
+                                   k[crypto_stream_salsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa2012.h
index 6c5d303..66545d1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa2012.h
@@ -21,30 +21,32 @@ extern "C" {
 
 #define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_keybytes(void);
+size_t crypto_stream_salsa2012_keybytes (void);
 
 #define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_noncebytes(void);
+size_t crypto_stream_salsa2012_noncebytes (void);
 
 #define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_messagebytes_max(void);
+size_t crypto_stream_salsa2012_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa2012_keygen(unsigned char 
k[crypto_stream_salsa2012_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa2012_keygen (unsigned char
+                                     k[crypto_stream_salsa2012_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa208.h
index d574f30..00ee015 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_salsa208.h
@@ -21,33 +21,34 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_noncebytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
-    SODIUM_EXPORT
-size_t crypto_stream_salsa208_messagebytes_max(void)
-            __attribute__ ((deprecated));
+SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char 
k[crypto_stream_salsa208_KEYBYTES])
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+void crypto_stream_salsa208_keygen (unsigned char
+                                    k[crypto_stream_salsa208_KEYBYTES])
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xchacha20.h
index c4002db..a42ba70 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xchacha20.h
@@ -22,37 +22,39 @@ extern "C" {
 
 #define crypto_stream_xchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_keybytes(void);
+size_t crypto_stream_xchacha20_keybytes (void);
 
 #define crypto_stream_xchacha20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_noncebytes(void);
+size_t crypto_stream_xchacha20_noncebytes (void);
 
 #define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_messagebytes_max(void);
+size_t crypto_stream_xchacha20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                   unsigned long long mlen,
-                                   const unsigned char *n, uint64_t ic,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen,
+                                    const unsigned char *n, uint64_t ic,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xchacha20_keygen(unsigned char 
k[crypto_stream_xchacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xchacha20_keygen (unsigned char
+                                     k[crypto_stream_xchacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xsalsa20.h
index 20034e3..60b0233 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_stream_xsalsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_keybytes(void);
+size_t crypto_stream_xsalsa20_keybytes (void);
 
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_noncebytes(void);
+size_t crypto_stream_xsalsa20_noncebytes (void);
 
 #define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_messagebytes_max(void);
+size_t crypto_stream_xsalsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xsalsa20_keygen(unsigned char 
k[crypto_stream_xsalsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xsalsa20_keygen (unsigned char
+                                    k[crypto_stream_xsalsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_16.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_16.h
index 7b9c807..ec377fd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_16.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_16.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_verify_16_bytes(void);
+size_t crypto_verify_16_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_16 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_32.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_32.h
index 9b0f452..03fa394 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_32.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_32.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_verify_32_bytes(void);
+size_t crypto_verify_32_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_32 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_64.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_64.h
index c83b730..fe18a74 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_64.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/crypto_verify_64.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_64_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_verify_64_bytes(void);
+size_t crypto_verify_64_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_64 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/export.h 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/export.h
index a0074fc..d943e3e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/export.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/export.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_export_H
 #define sodium_export_H
 
@@ -6,7 +5,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if ! defined(__clang__) && ! defined(__GNUC__)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
@@ -26,7 +25,7 @@
 # else
 #  if defined(__SUNPRO_C)
 #   ifndef __GNU_C__
-#    define SODIUM_EXPORT __attribute__ (visibility(__global))
+#    define SODIUM_EXPORT __attribute__ (visibility (__global))
 #   else
 #    define SODIUM_EXPORT __attribute__ __global
 #   endif
@@ -36,7 +35,7 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
-# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+# if defined(__ELF__) && ! defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
 # else
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
@@ -45,13 +44,13 @@
 
 #ifndef CRYPTO_ALIGN
 # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
-#  define CRYPTO_ALIGN(x) __declspec(align(x))
+#  define CRYPTO_ALIGN(x) __declspec(align (x))
 # else
-#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned (x)))
 # endif
 #endif
 
 #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#define SODIUM_SIZE_MAX SODIUM_MIN (UINT64_MAX, SIZE_MAX)
 
 #endif
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes.h
index c83a4df..3539ac8 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_H
 #define randombytes_H
 
@@ -16,54 +15,56 @@
 extern "C" {
 #endif
 
-typedef struct randombytes_implementation {
-    const char *(*implementation_name)(void); /* required */
-    uint32_t    (*random)(void);              /* required */
-    void        (*stir)(void);                /* optional */
-    uint32_t    (*uniform)(const uint32_t upper_bound); /* optional, a default 
implementation will be used if NULL */
-    void        (*buf)(void * const buf, const size_t size); /* required */
-    int         (*close)(void);               /* optional */
+typedef struct randombytes_implementation
+{
+  const char *(*implementation_name)(void);   /* required */
+  uint32_t (*random)(void);                   /* required */
+  void (*stir)(void);                         /* optional */
+  uint32_t (*uniform)(const uint32_t upper_bound);      /* optional, a default 
implementation will be used if NULL */
+  void (*buf)(void *const buf, const size_t size);           /* required */
+  int (*close)(void);                         /* optional */
 } randombytes_implementation;
 
-#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+#define randombytes_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, 0xffffffffUL)
 
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t randombytes_seedbytes(void);
+size_t randombytes_seedbytes (void);
 
 SODIUM_EXPORT
-void randombytes_buf(void * const buf, const size_t size)
-            __attribute__ ((nonnull));
+void randombytes_buf (void *const buf, const size_t size)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void randombytes_buf_deterministic(void * const buf, const size_t size,
-                                   const unsigned char 
seed[randombytes_SEEDBYTES])
-            __attribute__ ((nonnull));
+void randombytes_buf_deterministic (void *const buf, const size_t size,
+                                    const unsigned char
+                                    seed[randombytes_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-uint32_t randombytes_random(void);
+uint32_t randombytes_random (void);
 
 SODIUM_EXPORT
-uint32_t randombytes_uniform(const uint32_t upper_bound);
+uint32_t randombytes_uniform (const uint32_t upper_bound);
 
 SODIUM_EXPORT
-void randombytes_stir(void);
+void randombytes_stir (void);
 
 SODIUM_EXPORT
-int randombytes_close(void);
+int randombytes_close (void);
 
 SODIUM_EXPORT
-int randombytes_set_implementation(const randombytes_implementation *impl)
-            __attribute__ ((nonnull));
+int randombytes_set_implementation (const randombytes_implementation *impl)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-const char *randombytes_implementation_name(void);
+const char *randombytes_implementation_name (void);
 
 /* -- NaCl compatibility interface -- */
 
 SODIUM_EXPORT
-void randombytes(unsigned char * const buf, const unsigned long long buf_len)
-            __attribute__ ((nonnull));
+void randombytes (unsigned char *const buf, const unsigned long long buf_len)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_internal_random.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_internal_random.h
index 2b2b7d6..d9cd6b0 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_internal_random.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_internal_random.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_internal_random_H
 #define randombytes_internal_random_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_sysrandom.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_sysrandom.h
index 9e27b67..ebb284f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_sysrandom.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/randombytes_sysrandom.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_sysrandom_H
 #define randombytes_sysrandom_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/runtime.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/runtime.h
index c1cec85..471d71b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/runtime.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/runtime.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_runtime_H
 #define sodium_runtime_H
 
@@ -9,44 +8,44 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_neon(void);
+int sodium_runtime_has_neon (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_armcrypto(void);
+int sodium_runtime_has_armcrypto (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse2(void);
+int sodium_runtime_has_sse2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse3(void);
+int sodium_runtime_has_sse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_ssse3(void);
+int sodium_runtime_has_ssse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse41(void);
+int sodium_runtime_has_sse41 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx(void);
+int sodium_runtime_has_avx (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx2(void);
+int sodium_runtime_has_avx2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx512f(void);
+int sodium_runtime_has_avx512f (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_pclmul(void);
+int sodium_runtime_has_pclmul (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_aesni(void);
+int sodium_runtime_has_aesni (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_rdrand(void);
+int sodium_runtime_has_rdrand (void);
 
 /* ------------------------------------------------------------------------- */
 
-int _sodium_runtime_get_cpu_features(void);
+int _sodium_runtime_get_cpu_features (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/utils.h 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/utils.h
index f9b3697..39b121d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/utils.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/utils.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_utils_H
 #define sodium_utils_H
 
@@ -11,7 +10,8 @@ extern "C" {
 #endif
 
 #ifndef SODIUM_C99
-# if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 
199901L
+# if defined(__cplusplus) || ! defined(__STDC_VERSION__) || __STDC_VERSION__ < 
\
+  199901L
 #  define SODIUM_C99(X)
 # else
 #  define SODIUM_C99(X) X
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-void sodium_memzero(void * const pnt, const size_t len);
+void sodium_memzero (void *const pnt, const size_t len);
 
 SODIUM_EXPORT
-void sodium_stackzero(const size_t len);
+void sodium_stackzero (const size_t len);
 
 /*
  * WARNING: sodium_memcmp() must be used to verify if two secret keys
@@ -31,8 +31,8 @@ void sodium_stackzero(const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
-            __attribute__ ((warn_unused_result));
+int sodium_memcmp (const void *const b1_, const void *const b2_, size_t len)
+__attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -41,32 +41,32 @@ int sodium_memcmp(const void * const b1_, const void * 
const b2_, size_t len)
  * However, it is slower than sodium_memcmp().
  */
 SODIUM_EXPORT
-int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len) __attribute__ ((warn_unused_result));
+int sodium_compare (const unsigned char *b1_, const unsigned char *b2_,
+                    size_t len) __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int sodium_is_zero(const unsigned char *n, const size_t nlen);
+int sodium_is_zero (const unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_increment(unsigned char *n, const size_t nlen);
+void sodium_increment (unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_add(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_add (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-void sodium_sub(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_sub (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,
-                     const unsigned char * const bin, const size_t bin_len)
-            __attribute__ ((nonnull(1)));
+char *sodium_bin2hex (char *const hex, const size_t hex_maxlen,
+                      const unsigned char *const bin, const size_t bin_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
-                   const char * const hex, const size_t hex_len,
-                   const char * const ignore, size_t * const bin_len,
-                   const char ** const hex_end)
-            __attribute__ ((nonnull(1)));
+int sodium_hex2bin (unsigned char *const bin, const size_t bin_maxlen,
+                    const char *const hex, const size_t hex_len,
+                    const char *const ignore, size_t *const bin_len,
+                    const char **const hex_end)
+__attribute__ ((nonnull(1)));
 
 #define sodium_base64_VARIANT_ORIGINAL            1
 #define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
@@ -78,32 +78,35 @@ int sodium_hex2bin(unsigned char * const bin, const size_t 
bin_maxlen,
  * using the given variant. The computed length includes a trailing \0.
  */
 #define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT) \
-    (((BIN_LEN) / 3U) * 4U + \
-    ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 
3U) >> 1)) & 1U) * \
-     (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) - ((BIN_LEN) / 
3U) * 3U)))) + 1U)
+  (((BIN_LEN) / 3U) * 4U   \
+   + ((((BIN_LEN) -((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) -((BIN_LEN) / 3U) \
+                                              * 3U) >> 1)) & 1U)   \
+   * (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) -((BIN_LEN) \
+                                                                 / 3U) \
+                                                     * 3U)))) + 1U)
 
 SODIUM_EXPORT
-size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+size_t sodium_base64_encoded_len (const size_t bin_len, const int variant);
 
 SODIUM_EXPORT
-char *sodium_bin2base64(char * const b64, const size_t b64_maxlen,
-                        const unsigned char * const bin, const size_t bin_len,
-                        const int variant) __attribute__ ((nonnull(1)));
+char *sodium_bin2base64 (char *const b64, const size_t b64_maxlen,
+                         const unsigned char *const bin, const size_t bin_len,
+                         const int variant) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_base642bin(unsigned char * const bin, const size_t bin_maxlen,
-                      const char * const b64, const size_t b64_len,
-                      const char * const ignore, size_t * const bin_len,
-                      const char ** const b64_end, const int variant)
-            __attribute__ ((nonnull(1)));
+int sodium_base642bin (unsigned char *const bin, const size_t bin_maxlen,
+                       const char *const b64, const size_t b64_len,
+                       const char *const ignore, size_t *const bin_len,
+                       const char **const b64_end, const int variant)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_mlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_mlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_munlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_munlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 /* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
  * allocation functions.
@@ -139,38 +142,38 @@ int sodium_munlock(void * const addr, const size_t len)
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size)
-            __attribute__ ((malloc));
+void *sodium_malloc (const size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size)
-            __attribute__ ((malloc));
+void *sodium_allocarray (size_t count, size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void sodium_free(void *ptr);
+void sodium_free (void *ptr);
 
 SODIUM_EXPORT
-int sodium_mprotect_noaccess(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_noaccess (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readonly(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readonly (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readwrite(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readwrite (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
-               size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
-            __attribute__ ((nonnull(2)));
+int sodium_pad (size_t *padded_buflen_p, unsigned char *buf,
+                size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+__attribute__ ((nonnull(2)));
 
 SODIUM_EXPORT
-int sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
-                 size_t padded_buflen, size_t blocksize)
-            __attribute__ ((nonnull(2)));
+int sodium_unpad (size_t *unpadded_buflen_p, const unsigned char *buf,
+                  size_t padded_buflen, size_t blocksize)
+__attribute__ ((nonnull(2)));
 
 /* -------- */
 
-int _sodium_alloc_init(void);
+int _sodium_alloc_init (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/version.h
 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/version.h
index 022ab11..cec1b92 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/version.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/arm64-v8a/include/sodium/version.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_version_H
 #define sodium_version_H
 
@@ -15,16 +14,16 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-const char *sodium_version_string(void);
+const char *sodium_version_string (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_major(void);
+int         sodium_library_version_major (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_minor(void);
+int         sodium_library_version_minor (void);
 
 SODIUM_EXPORT
-int         sodium_library_minimal(void);
+int         sodium_library_minimal (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium.h 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium.h
index 86b7a4d..f11f028 100644
--- a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium.h
+++ b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_H
 #define sodium_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/core.h 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/core.h
index dd088d2..921c7e6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/core.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/core.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_core_H
 #define sodium_core_H
 
@@ -9,17 +8,17 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int sodium_init(void)
-            __attribute__ ((warn_unused_result));
+int sodium_init (void)
+__attribute__ ((warn_unused_result));
 
 /* ---- */
 
 SODIUM_EXPORT
-int sodium_set_misuse_handler(void (*handler)(void));
+int sodium_set_misuse_handler (void (*handler)(void));
 
 SODIUM_EXPORT
-void sodium_misuse(void)
-            __attribute__ ((noreturn));
+void sodium_misuse (void)
+__attribute__ ((noreturn));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis128l.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis128l.h
index 0ad019f..ba8a2c6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis128l.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis128l.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis128l_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_keybytes(void);
+size_t crypto_aead_aegis128l_keybytes (void);
 
 #define crypto_aead_aegis128l_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_nsecbytes(void);
+size_t crypto_aead_aegis128l_nsecbytes (void);
 
 #define crypto_aead_aegis128l_NPUBBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_npubbytes(void);
+size_t crypto_aead_aegis128l_npubbytes (void);
 
 #define crypto_aead_aegis128l_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_abytes(void);
+size_t crypto_aead_aegis128l_abytes (void);
 
 #define crypto_aead_aegis128l_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 
1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_messagebytes_max(void);
+size_t crypto_aead_aegis128l_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt(unsigned char       *c,
-                                  unsigned long long  *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long   mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis128l_encrypt (unsigned char       *c,
+                                   unsigned long long  *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt(unsigned char       *m,
-                                  unsigned long long  *mlen_p,
-                                  unsigned char       *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long   clen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis128l_decrypt (unsigned char       *m,
+                                   unsigned long long  *mlen_p,
+                                   unsigned char       *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt_detached(unsigned char       *c,
-                                           unsigned char       *mac,
-                                           unsigned long long  *maclen_p,
-                                           const unsigned char *m,
-                                           unsigned long long   mlen,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *nsec,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis128l_encrypt_detached (unsigned char       *c,
+                                            unsigned char       *mac,
+                                            unsigned long long  *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt_detached(unsigned char       *m,
-                                           unsigned char       *nsec,
-                                           const unsigned char *c,
-                                           unsigned long long   clen,
-                                           const unsigned char *mac,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis128l_decrypt_detached (unsigned char       *m,
+                                            unsigned char       *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis128l_keygen(unsigned char 
k[crypto_aead_aegis128l_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis128l_keygen (unsigned char
+                                   k[crypto_aead_aegis128l_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis256.h
index 26bd18a..6b3feff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aegis256.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_keybytes(void);
+size_t crypto_aead_aegis256_keybytes (void);
 
 #define crypto_aead_aegis256_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_nsecbytes(void);
+size_t crypto_aead_aegis256_nsecbytes (void);
 
 #define crypto_aead_aegis256_NPUBBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_npubbytes(void);
+size_t crypto_aead_aegis256_npubbytes (void);
 
 #define crypto_aead_aegis256_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_abytes(void);
+size_t crypto_aead_aegis256_abytes (void);
 
 #define crypto_aead_aegis256_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_messagebytes_max(void);
+size_t crypto_aead_aegis256_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt(unsigned char       *c,
-                                 unsigned long long  *clen_p,
-                                 const unsigned char *m,
-                                 unsigned long long   mlen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *nsec,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis256_encrypt (unsigned char       *c,
+                                  unsigned long long  *clen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *nsec,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt(unsigned char       *m,
-                                 unsigned long long  *mlen_p,
-                                 unsigned char       *nsec,
-                                 const unsigned char *c,
-                                 unsigned long long   clen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis256_decrypt (unsigned char       *m,
+                                  unsigned long long  *mlen_p,
+                                  unsigned char       *nsec,
+                                  const unsigned char *c,
+                                  unsigned long long clen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt_detached(unsigned char       *c,
-                                          unsigned char       *mac,
-                                          unsigned long long  *maclen_p,
-                                          const unsigned char *m,
-                                          unsigned long long   mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis256_encrypt_detached (unsigned char       *c,
+                                           unsigned char       *mac,
+                                           unsigned long long  *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt_detached(unsigned char       *m,
-                                          unsigned char       *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long   clen,
-                                          const unsigned char *mac,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis256_decrypt_detached (unsigned char       *m,
+                                           unsigned char       *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis256_keygen(unsigned char 
k[crypto_aead_aegis256_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis256_keygen (unsigned char
+                                  k[crypto_aead_aegis256_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aes256gcm.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aes256gcm.h
index 9baeb3f..5d259ff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aes256gcm.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_aes256gcm.h
@@ -32,145 +32,154 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_is_available(void);
+int crypto_aead_aes256gcm_is_available (void);
 
 #define crypto_aead_aes256gcm_KEYBYTES  32U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_keybytes(void);
+size_t crypto_aead_aes256gcm_keybytes (void);
 
 #define crypto_aead_aes256gcm_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_nsecbytes(void);
+size_t crypto_aead_aes256gcm_nsecbytes (void);
 
 #define crypto_aead_aes256gcm_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_npubbytes(void);
+size_t crypto_aead_aes256gcm_npubbytes (void);
 
 #define crypto_aead_aes256gcm_ABYTES    16U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_abytes(void);
+size_t crypto_aead_aes256gcm_abytes (void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)))
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
+              (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_messagebytes_max(void);
+size_t crypto_aead_aes256gcm_messagebytes_max (void);
 
-typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_ {
-    unsigned char opaque[512];
+typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_
+{
+  unsigned char opaque[512];
 } crypto_aead_aes256gcm_state;
 
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_statebytes(void);
+size_t crypto_aead_aes256gcm_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt(unsigned char *c,
-                                  unsigned long long *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_aes256gcm_encrypt (unsigned char *c,
+                                   unsigned long long *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt (unsigned char *m,
+                                   unsigned long long *mlen_p,
+                                   unsigned char *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached (unsigned char *c,
+                                            unsigned char *mac,
+                                            unsigned long long *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached (unsigned char *m,
+                                            unsigned char *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+/* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt(unsigned char *m,
-                                  unsigned long long *mlen_p,
-                                  unsigned char *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long clen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_aes256gcm_beforenm (crypto_aead_aes256gcm_state *ctx_,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
-                                           unsigned char *mac,
-                                           unsigned long long *maclen_p,
+int crypto_aead_aes256gcm_encrypt_afternm (unsigned char *c,
+                                           unsigned long long *clen_p,
                                            const unsigned char *m,
                                            unsigned long long mlen,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *nsec,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+int crypto_aead_aes256gcm_decrypt_afternm (unsigned char *m,
+                                           unsigned long long *mlen_p,
                                            unsigned char *nsec,
                                            const unsigned char *c,
                                            unsigned long long clen,
-                                           const unsigned char *mac,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-/* -- Precomputation interface -- */
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_afternm(unsigned char *c,
-                                          unsigned long long *clen_p,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
-                                          unsigned long long *mlen_p,
-                                          unsigned char *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long clen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
-                                                   unsigned char *mac,
-                                                   unsigned long long 
*maclen_p,
-                                                   const unsigned char *m,
-                                                   unsigned long long mlen,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *nsec,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
-                                                   unsigned char *nsec,
-                                                   const unsigned char *c,
-                                                   unsigned long long clen,
-                                                   const unsigned char *mac,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_aes256gcm_keygen(unsigned char 
k[crypto_aead_aes256gcm_KEYBYTES])
-            __attribute__ ((nonnull));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm (unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long
+                                                    long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm (unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_aes256gcm_keygen (unsigned char
+                                   k[crypto_aead_aes256gcm_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_chacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_chacha20poly1305.h
index 5d671df..686f5aa 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_chacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_chacha20poly1305.h
@@ -15,163 +15,181 @@ extern "C" {
 
 #define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
 
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * ((1ULL << 32) - 1ULL)))
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                       unsigned char *mac,
-                                                       unsigned long long 
*maclen_p,
-                                                       const unsigned char *m,
-                                                       unsigned long long mlen,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*nsec,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                       unsigned char *nsec,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char 
*mac,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+              (64ULL * ((1ULL << 32) - 1ULL)))
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt (unsigned char *c,
+                                               unsigned long long *clen_p,
+                                               const unsigned char *m,
+                                               unsigned long long mlen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *nsec,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt (unsigned char *m,
+                                               unsigned long long *mlen_p,
+                                               unsigned char *nsec,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                        unsigned char *mac,
+                                                        unsigned long
+                                                        long *maclen_p,
+                                                        const unsigned char *m,
+                                                        unsigned long long 
mlen,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *nsec,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                        unsigned char *nsec,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned
+                                                        char *mac,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_ietf_keygen (unsigned char
+                                               k[
+                                                 
crypto_aead_chacha20poly1305_ietf_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit 
internal counter -- */
 
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_keybytes(void);
+size_t crypto_aead_chacha20poly1305_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_NPUBBYTES 8U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_abytes(void);
+size_t crypto_aead_chacha20poly1305_abytes (void);
 
 #define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
-                                         unsigned long long *clen_p,
-                                         const unsigned char *m,
-                                         unsigned long long mlen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *nsec,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
-                                         unsigned long long *mlen_p,
-                                         unsigned char *nsec,
-                                         const unsigned char *c,
-                                         unsigned long long clen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
-                                                  unsigned char *mac,
-                                                  unsigned long long *maclen_p,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *nsec,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
-                                                  unsigned char *nsec,
-                                                  const unsigned char *c,
-                                                  unsigned long long clen,
-                                                  const unsigned char *mac,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt (unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt (unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt_detached (unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long 
*maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt_detached (unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_keygen (unsigned char
+                                          k[
+                                            
crypto_aead_chacha20poly1305_KEYBYTES
+                                          ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         
crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        
crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        
crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES           
crypto_aead_chacha20poly1305_ietf_ABYTES
-#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           \
+  crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_xchacha20poly1305.h
index 6643b0c..6bdd39f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_aead_xchacha20poly1305.h
@@ -13,85 +13,104 @@ extern "C" {
 
 #define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
-                                               unsigned long long *clen_p,
-                                               const unsigned char *m,
-                                               unsigned long long mlen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *nsec,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt (unsigned char *c,
+                                                unsigned long long *clen_p,
+                                                const unsigned char *m,
+                                                unsigned long long mlen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *nsec,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
-                                               unsigned long long *mlen_p,
-                                               unsigned char *nsec,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt (unsigned char *m,
+                                                unsigned long long *mlen_p,
+                                                unsigned char *nsec,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                        unsigned char *mac,
-                                                        unsigned long long 
*maclen_p,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*nsec,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                         unsigned char *mac,
+                                                         unsigned long
+                                                         long *maclen_p,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *nsec,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                        unsigned char *nsec,
-                                                        const unsigned char *c,
-                                                        unsigned long long 
clen,
-                                                        const unsigned char 
*mac,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                         unsigned char *nsec,
+                                                         const unsigned char 
*c,
+                                                         unsigned long long
+                                                         clen,
+                                                         const unsigned
+                                                         char *mac,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_aead_xchacha20poly1305_ietf_keygen (unsigned char
+                                                k[
+                                                  
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+                                                ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        
crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        
crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES           
crypto_aead_xchacha20poly1305_ietf_ABYTES
-#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           \
+  crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth.h
index 540aee0..ef7e5d9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth.h
@@ -15,29 +15,29 @@ extern "C" {
 
 #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
 SODIUM_EXPORT
-size_t  crypto_auth_bytes(void);
+size_t  crypto_auth_bytes (void);
 
 #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_auth_keybytes(void);
+size_t  crypto_auth_keybytes (void);
 
 #define crypto_auth_PRIMITIVE "hmacsha512256"
 SODIUM_EXPORT
-const char *crypto_auth_primitive(void);
+const char *crypto_auth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_auth(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_auth (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_verify (const unsigned char *h, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_auth_keygen(unsigned char k[crypto_auth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_keygen (unsigned char k[crypto_auth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha256.h
index 3da864c..925d0cc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha256.h
@@ -14,54 +14,57 @@ extern "C" {
 
 #define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_bytes(void);
+size_t crypto_auth_hmacsha256_bytes (void);
 
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_keybytes(void);
+size_t crypto_auth_hmacsha256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha256_state {
-    crypto_hash_sha256_state ictx;
-    crypto_hash_sha256_state octx;
+typedef struct crypto_auth_hmacsha256_state
+{
+  crypto_hash_sha256_state ictx;
+  crypto_hash_sha256_state octx;
 } crypto_auth_hmacsha256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_statebytes(void);
+size_t crypto_auth_hmacsha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_init (crypto_auth_hmacsha256_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_auth_hmacsha256_update (crypto_auth_hmacsha256_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_final (crypto_auth_hmacsha256_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha256_keygen(unsigned char 
k[crypto_auth_hmacsha256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha256_keygen (unsigned char
+                                    k[crypto_auth_hmacsha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512.h
index d992cb8..e5fd3ca 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512.h
@@ -14,52 +14,56 @@ extern "C" {
 
 #define crypto_auth_hmacsha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_bytes(void);
+size_t crypto_auth_hmacsha512_bytes (void);
 
 #define crypto_auth_hmacsha512_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_keybytes(void);
+size_t crypto_auth_hmacsha512_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha512_state {
-    crypto_hash_sha512_state ictx;
-    crypto_hash_sha512_state octx;
+typedef struct crypto_auth_hmacsha512_state
+{
+  crypto_hash_sha512_state ictx;
+  crypto_hash_sha512_state octx;
 } crypto_auth_hmacsha512_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_statebytes(void);
+size_t crypto_auth_hmacsha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_init (crypto_auth_hmacsha512_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512_update (crypto_auth_hmacsha512_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_final (crypto_auth_hmacsha512_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512_keygen(unsigned char 
k[crypto_auth_hmacsha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512_keygen (unsigned char
+                                    k[crypto_auth_hmacsha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512256.h
index 3fb5263..25a0787 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_auth_hmacsha512256.h
@@ -14,49 +14,53 @@ extern "C" {
 
 #define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_bytes(void);
+size_t crypto_auth_hmacsha512256_bytes (void);
 
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_keybytes(void);
+size_t crypto_auth_hmacsha512256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *out,
-                              const unsigned char *in,
-                              unsigned long long inlen,
-                              const unsigned char *k) __attribute__ 
((nonnull(1, 4)));
+int crypto_auth_hmacsha512256 (unsigned char *out,
+                               const unsigned char *in,
+                               unsigned long long inlen,
+                               const unsigned char *k) __attribute__ (
+  (nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *h,
-                                     const unsigned char *in,
-                                     unsigned long long inlen,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512256_verify (const unsigned char *h,
+                                      const unsigned char *in,
+                                      unsigned long long inlen,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
 typedef crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_statebytes(void);
+size_t crypto_auth_hmacsha512256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
-                                   const unsigned char *key,
-                                   size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512256_init (crypto_auth_hmacsha512256_state *state,
+                                    const unsigned char *key,
+                                    size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
-                                     const unsigned char *in,
-                                     unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512256_update (crypto_auth_hmacsha512256_state *state,
+                                      const unsigned char *in,
+                                      unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
-                                    unsigned char *out) __attribute__ 
((nonnull));
+int crypto_auth_hmacsha512256_final (crypto_auth_hmacsha512256_state *state,
+                                     unsigned char *out) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512256_keygen(unsigned char 
k[crypto_auth_hmacsha512256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512256_keygen (unsigned char
+                                       k[crypto_auth_hmacsha512256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box.h
index e060dd2..41190bd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box.h
@@ -22,153 +22,164 @@ extern "C" {
 
 #define crypto_box_SEEDBYTES crypto_box_curve25519xsalsa20poly1305_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_box_seedbytes(void);
+size_t  crypto_box_seedbytes (void);
 
-#define crypto_box_PUBLICKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_PUBLICKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_publickeybytes(void);
+size_t  crypto_box_publickeybytes (void);
 
-#define crypto_box_SECRETKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_SECRETKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_secretkeybytes(void);
+size_t  crypto_box_secretkeybytes (void);
 
 #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_box_noncebytes(void);
+size_t  crypto_box_noncebytes (void);
 
 #define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_box_macbytes(void);
+size_t  crypto_box_macbytes (void);
 
-#define crypto_box_MESSAGEBYTES_MAX 
crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_box_MESSAGEBYTES_MAX \
+  crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_box_messagebytes_max(void);
+size_t  crypto_box_messagebytes_max (void);
 
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_box_primitive(void);
+const char *crypto_box_primitive (void);
 
 SODIUM_EXPORT
-int crypto_box_seed_keypair(unsigned char *pk, unsigned char *sk,
-                            const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_box_seed_keypair (unsigned char *pk, unsigned char *sk,
+                             const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_easy (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen, const unsigned char *n,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open_easy (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen, const unsigned char *n,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_detached(unsigned char *c, unsigned char *mac,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
+int crypto_box_detached (unsigned char *c, unsigned char *mac,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *n, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
-                             const unsigned char *mac,
-                             unsigned long long clen,
-                             const unsigned char *n,
-                             const unsigned char *pk,
-                             const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+int crypto_box_open_detached (unsigned char *m, const unsigned char *c,
+                              const unsigned char *mac,
+                              unsigned long long clen,
+                              const unsigned char *n,
+                              const unsigned char *pk,
+                              const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
-#define crypto_box_BEFORENMBYTES 
crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_BEFORENMBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
 SODIUM_EXPORT
-size_t  crypto_box_beforenmbytes(void);
+size_t  crypto_box_beforenmbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_beforenm (unsigned char *k, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_box_easy_afternm (unsigned char *c, const unsigned char *m,
+                             unsigned long long mlen, const unsigned char *n,
+                             const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                             4,
+                                                                             
5)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
-                                 unsigned long long clen, const unsigned char 
*n,
-                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_easy_afternm (unsigned char *m, const unsigned char *c,
+                                  unsigned long long clen, const unsigned
+                                  char *n,
+                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
-                                const unsigned char *m, unsigned long long 
mlen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_detached_afternm (unsigned char *c, unsigned char *mac,
+                                 const unsigned char *m, unsigned long long
+                                 mlen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
-                                     const unsigned char *mac,
-                                     unsigned long long clen, const unsigned 
char *n,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_open_detached_afternm (unsigned char *m, const unsigned char *c,
+                                      const unsigned char *mac,
+                                      unsigned long long clen, const unsigned
+                                      char *n,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_SEALBYTES (crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_sealbytes(void);
+size_t crypto_box_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_seal(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_seal (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_seal_open (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_zerobytes(void);
+size_t  crypto_box_zerobytes (void);
 
-#define crypto_box_BOXZEROBYTES 
crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_BOXZEROBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_boxzerobytes(void);
+size_t  crypto_box_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box(unsigned char *c, const unsigned char *m,
-               unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box (unsigned char *c, const unsigned char *m,
+                unsigned long long mlen, const unsigned char *n,
+                const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open(unsigned char *m, const unsigned char *c,
-                    unsigned long long clen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open (unsigned char *m, const unsigned char *c,
+                     unsigned long long clen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_afternm(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen, const unsigned char *n,
-                       const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_box_afternm (unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                        5)));
 
 SODIUM_EXPORT
-int crypto_box_open_afternm(unsigned char *m, const unsigned char *c,
-                            unsigned long long clen, const unsigned char *n,
-                            const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_afternm (unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
index 26a3d31..092da6d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xchacha20poly1305.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_box_curve25519xchacha20poly1305_H
 #define crypto_box_curve25519xchacha20poly1305_H
 
@@ -15,147 +14,170 @@ extern "C" {
 
 #define crypto_box_curve25519xchacha20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_macbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max (void);
+
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+int crypto_box_curve25519xchacha20poly1305_seed_keypair (unsigned char *pk,
+                                                         unsigned char *sk,
+                                                         const unsigned
+                                                         char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
-                                                        unsigned char *sk,
-                                                        const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_keypair (unsigned char *pk,
+                                                    unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk,
-                                                   unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_easy (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *pk,
+                                                 const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *pk,
-                                                const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_open_easy (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
+int crypto_box_curve25519xchacha20poly1305_detached (unsigned char *c,
+                                                     unsigned char *mac,
+                                                     const unsigned char *m,
+                                                     unsigned long long mlen,
                                                      const unsigned char *n,
                                                      const unsigned char *pk,
                                                      const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c,
-                                                    unsigned char *mac,
-                                                    const unsigned char *m,
-                                                    unsigned long long mlen,
-                                                    const unsigned char *n,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m,
-                                                         const unsigned char 
*c,
-                                                         const unsigned char 
*mac,
-                                                         unsigned long long 
clen,
-                                                         const unsigned char 
*n,
-                                                         const unsigned char 
*pk,
-                                                         const unsigned char 
*sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached (unsigned char *m,
+                                                          const unsigned
+                                                          char *c,
+                                                          const unsigned
+                                                          char *mac,
+                                                          unsigned long long
+                                                          clen,
+                                                          const unsigned
+                                                          char *n,
+                                                          const unsigned
+                                                          char *pk,
+                                                          const unsigned
+                                                          char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char *n,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m,
-                                                             const unsigned 
char *c,
-                                                             unsigned long 
long clen,
-                                                             const unsigned 
char *n,
-                                                             const unsigned 
char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c,
-                                                            unsigned char *mac,
-                                                            const unsigned 
char *m,
-                                                            unsigned long long 
mlen,
-                                                            const unsigned 
char *n,
-                                                            const unsigned 
char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_curve25519xchacha20poly1305_beforenm (unsigned char *k,
+                                                     const unsigned char *pk,
+                                                     const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char 
*m,
-                                                                 const 
unsigned char *c,
-                                                                 const 
unsigned char *mac,
-                                                                 unsigned long 
long clen,
-                                                                 const 
unsigned char *n,
-                                                                 const 
unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_easy_afternm (unsigned char *c,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned char 
*n,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_easy_afternm (unsigned char *m,
+                                                              const unsigned
+                                                              char *c,
+                                                              unsigned long 
long
+                                                              clen,
+                                                              const unsigned
+                                                              char *n,
+                                                              const unsigned
+                                                              char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_detached_afternm (unsigned char *c,
+                                                             unsigned char 
*mac,
+                                                             const unsigned
+                                                             char *m,
+                                                             unsigned long long
+                                                             mlen,
+                                                             const unsigned
+                                                             char *n,
+                                                             const unsigned
+                                                             char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached_afternm (unsigned
+                                                                  char *m,
+                                                                  const 
unsigned
+                                                                  char *c,
+                                                                  const 
unsigned
+                                                                  char *mac,
+                                                                  unsigned long
+                                                                  long clen,
+                                                                  const 
unsigned
+                                                                  char *n,
+                                                                  const 
unsigned
+                                                                  char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_curve25519xchacha20poly1305_SEALBYTES \
-    (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES + \
-     crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES   \
+   + crypto_box_curve25519xchacha20poly1305_MACBYTES)
 
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_sealbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_curve25519xchacha20poly1305_seal (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal_open(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
-                                                     const unsigned char *pk,
-                                                     const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xchacha20poly1305_seal_open (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index e733f49..32e6b32 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -14,96 +14,98 @@ extern "C" {
 
 #define crypto_box_curve25519xsalsa20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair (unsigned char *pk,
+                                                        unsigned char *sk,
+                                                        const unsigned
+                                                        char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_keypair (unsigned char *pk,
+                                                   unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_beforenm (unsigned char *k,
+                                                    const unsigned char *pk,
+                                                    const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \
-    (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_zerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *n,
-                                          const unsigned char *pk,
-                                          const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305 (unsigned char *c,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *n,
+                                           const unsigned char *pk,
+                                           const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *n,
-                                               const unsigned char *pk,
-                                               const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305_open (unsigned char *m,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *n,
+                                                const unsigned char *pk,
+                                                const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *n,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_box_curve25519xsalsa20poly1305_afternm (unsigned char *c,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *n,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char *n,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xsalsa20poly1305_open_afternm (unsigned char *m,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned char *n,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ed25519.h
index dcc46a6..78800dc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ed25519.h
@@ -10,88 +10,92 @@ extern "C" {
 
 #define crypto_core_ed25519_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_bytes(void);
+size_t crypto_core_ed25519_bytes (void);
 
 #define crypto_core_ed25519_UNIFORMBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_uniformbytes(void);
+size_t crypto_core_ed25519_uniformbytes (void);
 
 #define crypto_core_ed25519_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_hashbytes(void);
+size_t crypto_core_ed25519_hashbytes (void);
 
 #define crypto_core_ed25519_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_scalarbytes(void);
+size_t crypto_core_ed25519_scalarbytes (void);
 
 #define crypto_core_ed25519_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_nonreducedscalarbytes(void);
+size_t crypto_core_ed25519_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ed25519_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_add(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_add (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_sub(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_sub (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_from_uniform (unsigned char *p, const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h)
-            __attribute__ ((nonnull)) __attribute__ ((deprecated));
+int crypto_core_ed25519_from_hash (unsigned char *p, const unsigned char *h)
+__attribute__ ((nonnull)) __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_scalar_invert(unsigned char *recip, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_scalar_invert (unsigned char *recip, const unsigned
+                                       char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_negate(unsigned char *neg, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_negate (unsigned char *neg, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_complement(unsigned char *comp, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_complement (unsigned char *comp, const unsigned
+                                            char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_add(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_add (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_sub(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_sub (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_mul(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_mul (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_reduce(unsigned char *r, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_reduce (unsigned char *r, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hchacha20.h
index ece141b..692f833 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hchacha20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hchacha20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_outputbytes(void);
+size_t crypto_core_hchacha20_outputbytes (void);
 
 #define crypto_core_hchacha20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_inputbytes(void);
+size_t crypto_core_hchacha20_inputbytes (void);
 
 #define crypto_core_hchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_keybytes(void);
+size_t crypto_core_hchacha20_keybytes (void);
 
 #define crypto_core_hchacha20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_constbytes(void);
+size_t crypto_core_hchacha20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hchacha20 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hsalsa20.h
index 4bf7a48..67ecdab 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_hsalsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_outputbytes(void);
+size_t crypto_core_hsalsa20_outputbytes (void);
 
 #define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_inputbytes(void);
+size_t crypto_core_hsalsa20_inputbytes (void);
 
 #define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_keybytes(void);
+size_t crypto_core_hsalsa20_keybytes (void);
 
 #define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_constbytes(void);
+size_t crypto_core_hsalsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hsalsa20 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ristretto255.h
index f2820e5..053957a 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_ristretto255.h
@@ -10,88 +10,90 @@ extern "C" {
 
 #define crypto_core_ristretto255_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_bytes(void);
+size_t crypto_core_ristretto255_bytes (void);
 
 #define crypto_core_ristretto255_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_hashbytes(void);
+size_t crypto_core_ristretto255_hashbytes (void);
 
 #define crypto_core_ristretto255_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_scalarbytes(void);
+size_t crypto_core_ristretto255_scalarbytes (void);
 
 #define crypto_core_ristretto255_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_nonreducedscalarbytes(void);
+size_t crypto_core_ristretto255_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_add(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_add (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_sub(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_sub (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_from_hash(unsigned char *p,
-                                       const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_from_hash (unsigned char *p,
+                                        const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_scalar_invert(unsigned char *recip,
-                                           const unsigned char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_scalar_invert (unsigned char *recip,
+                                            const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_negate(unsigned char *neg,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_negate (unsigned char *neg,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_complement(unsigned char *comp,
-                                                const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_complement (unsigned char *comp,
+                                                 const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_add(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_add (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_sub(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_sub (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_mul(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_mul (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_reduce(unsigned char *r,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_reduce (unsigned char *r,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa20.h
index bd79fd9..ffea366 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_outputbytes(void);
+size_t crypto_core_salsa20_outputbytes (void);
 
 #define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_inputbytes(void);
+size_t crypto_core_salsa20_inputbytes (void);
 
 #define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_keybytes(void);
+size_t crypto_core_salsa20_keybytes (void);
 
 #define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_constbytes(void);
+size_t crypto_core_salsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
-                        const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa20 (unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa2012.h
index 0595759..70740ac 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa2012.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_outputbytes(void);
+size_t crypto_core_salsa2012_outputbytes (void);
 
 #define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_inputbytes(void);
+size_t crypto_core_salsa2012_inputbytes (void);
 
 #define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_keybytes(void);
+size_t crypto_core_salsa2012_keybytes (void);
 
 #define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_constbytes(void);
+size_t crypto_core_salsa2012_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa2012 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa208.h
index d2f216a..fb91b43 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_core_salsa208.h
@@ -10,28 +10,28 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_outputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_inputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_constbytes (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa208 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash.h
index d897e5d..afe7a1e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash.h
@@ -15,31 +15,31 @@ extern "C" {
 
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_min(void);
+size_t  crypto_generichash_bytes_min (void);
 
 #define crypto_generichash_BYTES_MAX crypto_generichash_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_max(void);
+size_t  crypto_generichash_bytes_max (void);
 
 #define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
+size_t  crypto_generichash_bytes (void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_min(void);
+size_t  crypto_generichash_keybytes_min (void);
 
 #define crypto_generichash_KEYBYTES_MAX crypto_generichash_blake2b_KEYBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_max(void);
+size_t  crypto_generichash_keybytes_max (void);
 
 #define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_keybytes (void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_generichash_primitive(void);
+const char *crypto_generichash_primitive (void);
 
 /*
  * Important when writing bindings for other programming languages:
@@ -48,34 +48,34 @@ const char *crypto_generichash_primitive(void);
 typedef crypto_generichash_blake2b_state crypto_generichash_state;
 
 SODIUM_EXPORT
-size_t  crypto_generichash_statebytes(void);
+size_t  crypto_generichash_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash(unsigned char *out, size_t outlen,
-                       const unsigned char *in, unsigned long long inlen,
-                       const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash (unsigned char *out, size_t outlen,
+                        const unsigned char *in, unsigned long long inlen,
+                        const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_init(crypto_generichash_state *state,
-                            const unsigned char *key,
-                            const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_init (crypto_generichash_state *state,
+                             const unsigned char *key,
+                             const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_update(crypto_generichash_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_update (crypto_generichash_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_final(crypto_generichash_state *state,
-                             unsigned char *out, const size_t outlen)
-            __attribute__ ((nonnull));
+int crypto_generichash_final (crypto_generichash_state *state,
+                              unsigned char *out, const size_t outlen)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_keygen (unsigned char k[crypto_generichash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash_blake2b.h
index ae3b52f..e0e4462 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_generichash_blake2b.h
@@ -22,8 +22,9 @@ extern "C" {
 # pragma pack(push, 1)
 #endif
 
-typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state {
-    unsigned char opaque[384];
+typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state
+{
+  unsigned char opaque[384];
 } crypto_generichash_blake2b_state;
 
 #ifdef __IBMC__
@@ -36,84 +37,89 @@ typedef struct CRYPTO_ALIGN(64) 
crypto_generichash_blake2b_state {
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_min(void);
+size_t crypto_generichash_blake2b_bytes_min (void);
 
 #define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_max(void);
+size_t crypto_generichash_blake2b_bytes_max (void);
 
 #define crypto_generichash_blake2b_BYTES         32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes(void);
+size_t crypto_generichash_blake2b_bytes (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_min(void);
+size_t crypto_generichash_blake2b_keybytes_min (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_max(void);
+size_t crypto_generichash_blake2b_keybytes_max (void);
 
 #define crypto_generichash_blake2b_KEYBYTES      32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes(void);
+size_t crypto_generichash_blake2b_keybytes (void);
 
 #define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_saltbytes(void);
+size_t crypto_generichash_blake2b_saltbytes (void);
 
 #define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_personalbytes(void);
+size_t crypto_generichash_blake2b_personalbytes (void);
 
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_statebytes(void);
+size_t crypto_generichash_blake2b_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
-                               const unsigned char *in,
-                               unsigned long long inlen,
-                               const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b (unsigned char *out, size_t outlen,
+                                const unsigned char *in,
+                                unsigned long long inlen,
+                                const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
-                                             const unsigned char *in,
-                                             unsigned long long inlen,
-                                             const unsigned char *key,
-                                             size_t keylen,
-                                             const unsigned char *salt,
-                                             const unsigned char *personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_salt_personal (unsigned char *out, size_t 
outlen,
+                                              const unsigned char *in,
+                                              unsigned long long inlen,
+                                              const unsigned char *key,
+                                              size_t keylen,
+                                              const unsigned char *salt,
+                                              const unsigned char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
-                                    const unsigned char *key,
-                                    const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init (crypto_generichash_blake2b_state *state,
+                                     const unsigned char *key,
+                                     const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int 
crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state 
*state,
-                                                  const unsigned char *key,
-                                                  const size_t keylen, const 
size_t outlen,
-                                                  const unsigned char *salt,
-                                                  const unsigned char 
*personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init_salt_personal (
+  crypto_generichash_blake2b_state *state,
+  const unsigned char *key,
+  const size_t keylen, const
+  size_t outlen,
+  const unsigned char *salt,
+  const unsigned
+  char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
-                                      const unsigned char *in,
-                                      unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_update (crypto_generichash_blake2b_state *state,
+                                       const unsigned char *in,
+                                       unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
-                                     unsigned char *out,
-                                     const size_t outlen) __attribute__ 
((nonnull));
+int crypto_generichash_blake2b_final (crypto_generichash_blake2b_state *state,
+                                      unsigned char *out,
+                                      const size_t outlen) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_blake2b_keygen(unsigned char 
k[crypto_generichash_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_blake2b_keygen (unsigned char
+                                        k[crypto_generichash_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash.h
index 767d548..a0ac1fe 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash.h
@@ -22,16 +22,16 @@ extern "C" {
 
 #define crypto_hash_BYTES crypto_hash_sha512_BYTES
 SODIUM_EXPORT
-size_t crypto_hash_bytes(void);
+size_t crypto_hash_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 #define crypto_hash_PRIMITIVE "sha512"
 SODIUM_EXPORT
-const char *crypto_hash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_hash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha256.h
index c47982a..2adabae 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha256.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha256_state {
-    uint32_t state[8];
-    uint64_t count;
-    uint8_t  buf[64];
+typedef struct crypto_hash_sha256_state
+{
+  uint32_t state[8];
+  uint64_t count;
+  uint8_t buf[64];
 } crypto_hash_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha256_statebytes(void);
+size_t crypto_hash_sha256_statebytes (void);
 
 #define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_hash_sha256_bytes(void);
+size_t crypto_hash_sha256_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha256 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_init(crypto_hash_sha256_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_init (crypto_hash_sha256_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha256_update (crypto_hash_sha256_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_final (crypto_hash_sha256_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha512.h
index 5b690fb..b9618a7 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_hash_sha512.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha512_state {
-    uint64_t state[8];
-    uint64_t count[2];
-    uint8_t  buf[128];
+typedef struct crypto_hash_sha512_state
+{
+  uint64_t state[8];
+  uint64_t count[2];
+  uint8_t buf[128];
 } crypto_hash_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha512_statebytes(void);
+size_t crypto_hash_sha512_statebytes (void);
 
 #define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_hash_sha512_bytes(void);
+size_t crypto_hash_sha512_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha512 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_init(crypto_hash_sha512_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_init (crypto_hash_sha512_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha512_update (crypto_hash_sha512_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_final (crypto_hash_sha512_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf.h
index ac2fc61..f083146 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf.h
@@ -16,35 +16,35 @@ extern "C" {
 
 #define crypto_kdf_BYTES_MIN crypto_kdf_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_min(void);
+size_t crypto_kdf_bytes_min (void);
 
 #define crypto_kdf_BYTES_MAX crypto_kdf_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_max(void);
+size_t crypto_kdf_bytes_max (void);
 
 #define crypto_kdf_CONTEXTBYTES crypto_kdf_blake2b_CONTEXTBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_contextbytes(void);
+size_t crypto_kdf_contextbytes (void);
 
 #define crypto_kdf_KEYBYTES crypto_kdf_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_keybytes(void);
+size_t crypto_kdf_keybytes (void);
 
 #define crypto_kdf_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_kdf_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_kdf_primitive (void)
+__attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int crypto_kdf_derive_from_key(unsigned char *subkey, size_t subkey_len,
-                               uint64_t subkey_id,
-                               const char ctx[crypto_kdf_CONTEXTBYTES],
-                               const unsigned char key[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_derive_from_key (unsigned char *subkey, size_t subkey_len,
+                                uint64_t subkey_id,
+                                const char ctx[crypto_kdf_CONTEXTBYTES],
+                                const unsigned char key[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_kdf_keygen(unsigned char k[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_keygen (unsigned char k[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_blake2b.h
index 489c7c2..a2f287e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_blake2b.h
@@ -16,26 +16,29 @@ extern "C" {
 
 #define crypto_kdf_blake2b_BYTES_MIN 16
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_min(void);
+size_t crypto_kdf_blake2b_bytes_min (void);
 
 #define crypto_kdf_blake2b_BYTES_MAX 64
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_max(void);
+size_t crypto_kdf_blake2b_bytes_max (void);
 
 #define crypto_kdf_blake2b_CONTEXTBYTES 8
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_contextbytes(void);
+size_t crypto_kdf_blake2b_contextbytes (void);
 
 #define crypto_kdf_blake2b_KEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_keybytes(void);
+size_t crypto_kdf_blake2b_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_blake2b_derive_from_key(unsigned char *subkey, size_t 
subkey_len,
-                                       uint64_t subkey_id,
-                                       const char 
ctx[crypto_kdf_blake2b_CONTEXTBYTES],
-                                       const unsigned char 
key[crypto_kdf_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_blake2b_derive_from_key (unsigned char *subkey, size_t
+                                        subkey_len,
+                                        uint64_t subkey_id,
+                                        const char
+                                        ctx[crypto_kdf_blake2b_CONTEXTBYTES],
+                                        const unsigned char
+                                        key[crypto_kdf_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha256.h
index e7e7f4d..39ba301 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha256.h
@@ -18,54 +18,61 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha256_KEYBYTES crypto_auth_hmacsha256_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_keybytes(void);
+size_t crypto_kdf_hkdf_sha256_keybytes (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_min(void);
+size_t crypto_kdf_hkdf_sha256_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MAX (0xff * crypto_auth_hmacsha256_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_max(void);
+size_t crypto_kdf_hkdf_sha256_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(4)));
+int crypto_kdf_hkdf_sha256_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(4)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha256_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
+void crypto_kdf_hkdf_sha256_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha256_state {
-    crypto_auth_hmacsha256_state st;
+typedef struct crypto_kdf_hkdf_sha256_state
+{
+  crypto_auth_hmacsha256_state st;
 } crypto_kdf_hkdf_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_statebytes(void);
+size_t crypto_kdf_hkdf_sha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_init(crypto_kdf_hkdf_sha256_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_extract_init (crypto_kdf_hkdf_sha256_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_update(crypto_kdf_hkdf_sha256_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_update (crypto_kdf_hkdf_sha256_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_final(crypto_kdf_hkdf_sha256_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_final (crypto_kdf_hkdf_sha256_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha512.h
index 0ed205d..bfcabdb 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kdf_hkdf_sha512.h
@@ -18,55 +18,62 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha512_KEYBYTES crypto_auth_hmacsha512_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_keybytes(void);
+size_t crypto_kdf_hkdf_sha512_keybytes (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_min(void);
+size_t crypto_kdf_hkdf_sha512_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MAX (0xff * crypto_auth_hmacsha512_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_max(void);
+size_t crypto_kdf_hkdf_sha512_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha512_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_hkdf_sha512_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha512_state {
-    crypto_auth_hmacsha512_state st;
+typedef struct crypto_kdf_hkdf_sha512_state
+{
+  crypto_auth_hmacsha512_state st;
 } crypto_kdf_hkdf_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_statebytes(void);
+size_t crypto_kdf_hkdf_sha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_init(crypto_kdf_hkdf_sha512_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract_init (crypto_kdf_hkdf_sha512_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_update(crypto_kdf_hkdf_sha512_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_update (crypto_kdf_hkdf_sha512_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_final(crypto_kdf_hkdf_sha512_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_final (crypto_kdf_hkdf_sha512_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kx.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kx.h
index 347132c..2227064 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kx.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_kx.h
@@ -14,50 +14,56 @@ extern "C" {
 
 #define crypto_kx_PUBLICKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_publickeybytes(void);
+size_t crypto_kx_publickeybytes (void);
 
 #define crypto_kx_SECRETKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_secretkeybytes(void);
+size_t crypto_kx_secretkeybytes (void);
 
 #define crypto_kx_SEEDBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_seedbytes(void);
+size_t crypto_kx_seedbytes (void);
 
 #define crypto_kx_SESSIONKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_sessionkeybytes(void);
+size_t crypto_kx_sessionkeybytes (void);
 
 #define crypto_kx_PRIMITIVE "x25519blake2b"
 SODIUM_EXPORT
-const char *crypto_kx_primitive(void);
+const char *crypto_kx_primitive (void);
 
 SODIUM_EXPORT
-int crypto_kx_seed_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                           unsigned char sk[crypto_kx_SECRETKEYBYTES],
-                           const unsigned char seed[crypto_kx_SEEDBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_seed_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                            unsigned char sk[crypto_kx_SECRETKEYBYTES],
+                            const unsigned char seed[crypto_kx_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                      unsigned char sk[crypto_kx_SECRETKEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                       unsigned char sk[crypto_kx_SECRETKEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_client_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
client_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_client_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   client_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_kx_server_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
server_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_server_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   server_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth.h
index 7cd7b07..25ada13 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth.h
@@ -16,47 +16,48 @@ extern "C" {
 typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
 
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_statebytes(void);
+size_t  crypto_onetimeauth_statebytes (void);
 
 #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_bytes(void);
+size_t  crypto_onetimeauth_bytes (void);
 
 #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_keybytes(void);
+size_t  crypto_onetimeauth_keybytes (void);
 
 #define crypto_onetimeauth_PRIMITIVE "poly1305"
 SODIUM_EXPORT
-const char *crypto_onetimeauth_primitive(void);
+const char *crypto_onetimeauth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_verify(const unsigned char *h, const unsigned char *in,
-                              unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_verify (const unsigned char *h, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_init(crypto_onetimeauth_state *state,
-                            const unsigned char *key) __attribute__ 
((nonnull));
+int crypto_onetimeauth_init (crypto_onetimeauth_state *state,
+                             const unsigned char *key) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_update(crypto_onetimeauth_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_update (crypto_onetimeauth_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_final(crypto_onetimeauth_state *state,
-                             unsigned char *out) __attribute__ ((nonnull));
+int crypto_onetimeauth_final (crypto_onetimeauth_state *state,
+                              unsigned char *out) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_keygen (unsigned char k[crypto_onetimeauth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth_poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth_poly1305.h
index 1565d37..027107c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth_poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_onetimeauth_poly1305.h
@@ -16,54 +16,57 @@
 extern "C" {
 #endif
 
-typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state {
-    unsigned char opaque[256];
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+  unsigned char opaque[256];
 } crypto_onetimeauth_poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_statebytes(void);
+size_t crypto_onetimeauth_poly1305_statebytes (void);
 
 #define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_bytes(void);
+size_t crypto_onetimeauth_poly1305_bytes (void);
 
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_keybytes(void);
+size_t crypto_onetimeauth_poly1305_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305(unsigned char *out,
-                                const unsigned char *in,
-                                unsigned long long inlen,
-                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth_poly1305 (unsigned char *out,
+                                 const unsigned char *in,
+                                 unsigned long long inlen,
+                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_verify(const unsigned char *h,
-                                       const unsigned char *in,
-                                       unsigned long long inlen,
-                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_poly1305_verify (const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long inlen,
+                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
-                                     const unsigned char *key)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_init (crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state 
*state,
-                                       const unsigned char *in,
-                                       unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_poly1305_update (
+  crypto_onetimeauth_poly1305_state *state,
+  const unsigned char *in,
+  unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
-                                      unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_final (crypto_onetimeauth_poly1305_state 
*state,
+                                       unsigned char *out)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_poly1305_keygen(unsigned char 
k[crypto_onetimeauth_poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_poly1305_keygen (unsigned char
+                                         
k[crypto_onetimeauth_poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash.h
index 9683192..7e0ee9c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash.h
@@ -16,83 +16,87 @@ extern "C" {
 
 #define crypto_pwhash_ALG_ARGON2I13 crypto_pwhash_argon2i_ALG_ARGON2I13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2i13(void);
+int crypto_pwhash_alg_argon2i13 (void);
 
 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2id13(void);
+int crypto_pwhash_alg_argon2id13 (void);
 
 #define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_default(void);
+int crypto_pwhash_alg_default (void);
 
 #define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_min(void);
+size_t crypto_pwhash_bytes_min (void);
 
 #define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_max(void);
+size_t crypto_pwhash_bytes_max (void);
 
 #define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_min(void);
+size_t crypto_pwhash_passwd_min (void);
 
 #define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_max(void);
+size_t crypto_pwhash_passwd_max (void);
 
 #define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_saltbytes(void);
+size_t crypto_pwhash_saltbytes (void);
 
 #define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_strbytes(void);
+size_t crypto_pwhash_strbytes (void);
 
 #define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
-const char *crypto_pwhash_strprefix(void);
+const char *crypto_pwhash_strprefix (void);
 
 #define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_min(void);
+size_t crypto_pwhash_opslimit_min (void);
 
 #define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_max(void);
+size_t crypto_pwhash_opslimit_max (void);
 
 #define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_min(void);
+size_t crypto_pwhash_memlimit_min (void);
 
 #define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_max(void);
+size_t crypto_pwhash_memlimit_max (void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_interactive(void);
+size_t crypto_pwhash_opslimit_interactive (void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_interactive(void);
+size_t crypto_pwhash_memlimit_interactive (void);
 
 #define crypto_pwhash_OPSLIMIT_MODERATE 
crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_moderate(void);
+size_t crypto_pwhash_opslimit_moderate (void);
 
 #define crypto_pwhash_MEMLIMIT_MODERATE 
crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_moderate(void);
+size_t crypto_pwhash_memlimit_moderate (void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE 
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_sensitive(void);
+size_t crypto_pwhash_opslimit_sensitive (void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE 
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_sensitive(void);
+size_t crypto_pwhash_memlimit_sensitive (void);
 
 /*
  * With this function, do not forget to store all parameters, including the
@@ -101,11 +105,11 @@ size_t crypto_pwhash_memlimit_sensitive(void);
  * may change.
  */
 SODIUM_EXPORT
-int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
-                  const char * const passwd, unsigned long long passwdlen,
-                  const unsigned char * const salt,
-                  unsigned long long opslimit, size_t memlimit, int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash (unsigned char *const out, unsigned long long outlen,
+                   const char *const passwd, unsigned long long passwdlen,
+                   const unsigned char *const salt,
+                   unsigned long long opslimit, size_t memlimit, int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /*
  * The output string already includes all the required parameters, including
@@ -113,32 +117,35 @@ int crypto_pwhash(unsigned char * const out, unsigned 
long long outlen,
  * order to verify a password.
  */
 SODIUM_EXPORT
-int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
-                      const char * const passwd, unsigned long long passwdlen,
-                      unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str (char out[crypto_pwhash_STRBYTES],
+                       const char *const passwd, unsigned long long passwdlen,
+                       unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
-                          const char * const passwd, unsigned long long 
passwdlen,
-                          unsigned long long opslimit, size_t memlimit, int 
alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_alg (char out[crypto_pwhash_STRBYTES],
+                           const char *const passwd, unsigned long long
+                           passwdlen,
+                           unsigned long long opslimit, size_t memlimit, int
+                           alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_verify(const char *str,
-                             const char * const passwd,
-                             unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_verify (const char *str,
+                              const char *const passwd,
+                              unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_needs_rehash(const char *str,
-                                   unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_needs_rehash (const char *str,
+                                    unsigned long long opslimit, size_t
+                                    memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
-const char *crypto_pwhash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_pwhash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2i.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2i.h
index 63abdf4..65b2bc4 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2i.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2i.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2i_ALG_ARGON2I13 1
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_alg_argon2i13(void);
+int crypto_pwhash_argon2i_alg_argon2i13 (void);
 
 #define crypto_pwhash_argon2i_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_min(void);
+size_t crypto_pwhash_argon2i_bytes_min (void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                    4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_max(void);
+size_t crypto_pwhash_argon2i_bytes_max (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_min(void);
+size_t crypto_pwhash_argon2i_passwd_min (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_max(void);
+size_t crypto_pwhash_argon2i_passwd_max (void);
 
 #define crypto_pwhash_argon2i_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_saltbytes(void);
+size_t crypto_pwhash_argon2i_saltbytes (void);
 
 #define crypto_pwhash_argon2i_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_strbytes(void);
+size_t crypto_pwhash_argon2i_strbytes (void);
 
 #define crypto_pwhash_argon2i_STRPREFIX "$argon2i$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2i_strprefix(void);
+const char *crypto_pwhash_argon2i_strprefix (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MIN 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_min(void);
+size_t crypto_pwhash_argon2i_opslimit_min (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_max(void);
+size_t crypto_pwhash_argon2i_opslimit_max (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_min(void);
+size_t crypto_pwhash_argon2i_memlimit_min (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_max(void);
+size_t crypto_pwhash_argon2i_memlimit_max (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_interactive(void);
+size_t crypto_pwhash_argon2i_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_interactive(void);
+size_t crypto_pwhash_argon2i_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MODERATE 6U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_moderate(void);
+size_t crypto_pwhash_argon2i_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MODERATE 134217728U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_moderate(void);
+size_t crypto_pwhash_argon2i_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE 8U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2i_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE 536870912U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2i_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i(unsigned char * const out,
-                          unsigned long long outlen,
-                          const char * const passwd,
-                          unsigned long long passwdlen,
-                          const unsigned char * const salt,
-                          unsigned long long opslimit, size_t memlimit,
-                          int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i (unsigned char *const out,
+                           unsigned long long outlen,
+                           const char *const passwd,
+                           unsigned long long passwdlen,
+                           const unsigned char *const salt,
+                           unsigned long long opslimit, size_t memlimit,
+                           int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str(char out[crypto_pwhash_argon2i_STRBYTES],
-                              const char * const passwd,
-                              unsigned long long passwdlen,
-                              unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str (char out[crypto_pwhash_argon2i_STRBYTES],
+                               const char *const passwd,
+                               unsigned long long passwdlen,
+                               unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_verify(const char * str,
-                                     const char * const passwd,
-                                     unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_verify (const char *str,
+                                      const char *const passwd,
+                                      unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_needs_rehash(const char * str,
-                                           unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_needs_rehash (const char *str,
+                                            unsigned long long opslimit, size_t
+                                            memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2id.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2id.h
index 98bc83e..6a2194f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2id.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_argon2id.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_alg_argon2id13(void);
+int crypto_pwhash_argon2id_alg_argon2id13 (void);
 
 #define crypto_pwhash_argon2id_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_min(void);
+size_t crypto_pwhash_argon2id_bytes_min (void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                     4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_max(void);
+size_t crypto_pwhash_argon2id_bytes_max (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_min(void);
+size_t crypto_pwhash_argon2id_passwd_min (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_max(void);
+size_t crypto_pwhash_argon2id_passwd_max (void);
 
 #define crypto_pwhash_argon2id_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_saltbytes(void);
+size_t crypto_pwhash_argon2id_saltbytes (void);
 
 #define crypto_pwhash_argon2id_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_strbytes(void);
+size_t crypto_pwhash_argon2id_strbytes (void);
 
 #define crypto_pwhash_argon2id_STRPREFIX "$argon2id$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2id_strprefix(void);
+const char *crypto_pwhash_argon2id_strprefix (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MIN 1U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_min(void);
+size_t crypto_pwhash_argon2id_opslimit_min (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_max(void);
+size_t crypto_pwhash_argon2id_opslimit_max (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_min(void);
+size_t crypto_pwhash_argon2id_memlimit_min (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_max(void);
+size_t crypto_pwhash_argon2id_memlimit_max (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE 2U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_interactive(void);
+size_t crypto_pwhash_argon2id_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE 67108864U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_interactive(void);
+size_t crypto_pwhash_argon2id_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MODERATE 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_moderate(void);
+size_t crypto_pwhash_argon2id_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MODERATE 268435456U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_moderate(void);
+size_t crypto_pwhash_argon2id_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2id_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2id_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id(unsigned char * const out,
-                           unsigned long long outlen,
-                           const char * const passwd,
-                           unsigned long long passwdlen,
-                           const unsigned char * const salt,
-                           unsigned long long opslimit, size_t memlimit,
-                           int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id (unsigned char *const out,
+                            unsigned long long outlen,
+                            const char *const passwd,
+                            unsigned long long passwdlen,
+                            const unsigned char *const salt,
+                            unsigned long long opslimit, size_t memlimit,
+                            int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str(char out[crypto_pwhash_argon2id_STRBYTES],
-                               const char * const passwd,
-                               unsigned long long passwdlen,
-                               unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str (char out[crypto_pwhash_argon2id_STRBYTES],
+                                const char *const passwd,
+                                unsigned long long passwdlen,
+                                unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_verify(const char * str,
-                                      const char * const passwd,
-                                      unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_verify (const char *str,
+                                       const char *const passwd,
+                                       unsigned long long passwdlen)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_needs_rehash(const char * str,
-                                            unsigned long long opslimit, 
size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_needs_rehash (const char *str,
+                                             unsigned long long opslimit, 
size_t
+                                             memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
index 8956dfb..ed33309 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
@@ -16,102 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
+  SODIUM_MIN (SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_saltbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_strbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$"
 SODIUM_EXPORT
-const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void);
+const char *crypto_pwhash_scryptsalsa208sha256_strprefix (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MIN 32768U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MIN 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
-    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
+  SODIUM_MIN (SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256(unsigned char * const out,
-                                       unsigned long long outlen,
-                                       const char * const passwd,
-                                       unsigned long long passwdlen,
-                                       const unsigned char * const salt,
-                                       unsigned long long opslimit,
-                                       size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256 (unsigned char *const out,
+                                        unsigned long long outlen,
+                                        const char *const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char *const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str(char 
out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
-                                           const char * const passwd,
-                                           unsigned long long passwdlen,
-                                           unsigned long long opslimit,
-                                           size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str (char
+                                            out[
+                                              
crypto_pwhash_scryptsalsa208sha256_STRBYTES
+                                            ],
+                                            const char *const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_verify(const char * str,
-                                                  const char * const passwd,
-                                                  unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_verify (const char *str,
+                                                   const char *const passwd,
+                                                   unsigned long long 
passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t 
passwdlen,
-                                          const uint8_t * salt, size_t saltlen,
-                                          uint64_t N, uint32_t r, uint32_t p,
-                                          uint8_t * buf, size_t buflen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_ll (const uint8_t *passwd, size_t
+                                           passwdlen,
+                                           const uint8_t *salt, size_t saltlen,
+                                           uint64_t N, uint32_t r, uint32_t p,
+                                           uint8_t *buf, size_t buflen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char * str,
-                                                        unsigned long long 
opslimit,
-                                                        size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash (const char *str,
+                                                         unsigned long long
+                                                         opslimit,
+                                                         size_t memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult.h
index 1c68585..15586d3 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult.h
@@ -12,19 +12,19 @@ extern "C" {
 
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_bytes(void);
+size_t  crypto_scalarmult_bytes (void);
 
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_scalarbytes(void);
+size_t  crypto_scalarmult_scalarbytes (void);
 
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 SODIUM_EXPORT
-const char *crypto_scalarmult_primitive(void);
+const char *crypto_scalarmult_primitive (void);
 
 SODIUM_EXPORT
-int crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -35,9 +35,9 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned 
char *n)
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult(unsigned char *q, const unsigned char *n,
-                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult (unsigned char *q, const unsigned char *n,
+                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_curve25519.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_curve25519.h
index 60e9d0c..9cde57c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_curve25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_curve25519.h
@@ -11,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_curve25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_bytes(void);
+size_t crypto_scalarmult_curve25519_bytes (void);
 
 #define crypto_scalarmult_curve25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_scalarbytes(void);
+size_t crypto_scalarmult_curve25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -26,14 +26,14 @@ size_t crypto_scalarmult_curve25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
-                                 const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519 (unsigned char *q, const unsigned char *n,
+                                  const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519_base(unsigned char *q,
-                                      const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519_base (unsigned char *q,
+                                       const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ed25519.h
index 2dfa4d7..749c0c1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ed25519.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ed25519_H
 #define crypto_scalarmult_ed25519_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ed25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_bytes(void);
+size_t crypto_scalarmult_ed25519_bytes (void);
 
 #define crypto_scalarmult_ed25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_scalarbytes(void);
+size_t crypto_scalarmult_ed25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,22 +26,23 @@ size_t crypto_scalarmult_ed25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519(unsigned char *q, const unsigned char *n,
-                              const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519 (unsigned char *q, const unsigned char *n,
+                               const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_noclamp(unsigned char *q, const unsigned char *n,
-                                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_noclamp (unsigned char *q, const unsigned char 
*n,
+                                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base_noclamp(unsigned char *q, const unsigned 
char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base_noclamp (unsigned char *q, const unsigned
+                                            char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ristretto255.h
index 40a45cc..b1840a1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_scalarmult_ristretto255.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ristretto255_H
 #define crypto_scalarmult_ristretto255_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ristretto255_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_bytes(void);
+size_t crypto_scalarmult_ristretto255_bytes (void);
 
 #define crypto_scalarmult_ristretto255_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_scalarbytes(void);
+size_t crypto_scalarmult_ristretto255_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,14 +26,14 @@ size_t crypto_scalarmult_ristretto255_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255(unsigned char *q, const unsigned char *n,
-                                   const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255 (unsigned char *q, const unsigned char *n,
+                                    const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255_base(unsigned char *q,
-                                        const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255_base (unsigned char *q,
+                                         const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox.h
index 1d3709d..c764617 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox.h
@@ -15,76 +15,80 @@ extern "C" {
 
 #define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_keybytes(void);
+size_t  crypto_secretbox_keybytes (void);
 
 #define crypto_secretbox_NONCEBYTES 
crypto_secretbox_xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_noncebytes(void);
+size_t  crypto_secretbox_noncebytes (void);
 
 #define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_macbytes(void);
+size_t  crypto_secretbox_macbytes (void);
 
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_secretbox_primitive(void);
+const char *crypto_secretbox_primitive (void);
 
-#define crypto_secretbox_MESSAGEBYTES_MAX 
crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_secretbox_MESSAGEBYTES_MAX \
+  crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t crypto_secretbox_messagebytes_max(void);
+size_t crypto_secretbox_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
-                          unsigned long long mlen, const unsigned char *n,
-                          const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_secretbox_easy (unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k) __attribute__ ((nonnull(1, 
4,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
-                               unsigned long long clen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open_easy (unsigned char *m, const unsigned char *c,
+                                unsigned long long clen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
-                              const unsigned char *m,
-                              unsigned long long mlen,
-                              const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_detached (unsigned char *c, unsigned char *mac,
+                               const unsigned char *m,
+                               unsigned long long mlen,
+                               const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_detached(unsigned char *m,
-                                   const unsigned char *c,
-                                   const unsigned char *mac,
-                                   unsigned long long clen,
-                                   const unsigned char *n,
-                                   const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_open_detached (unsigned char *m,
+                                    const unsigned char *c,
+                                    const unsigned char *mac,
+                                    unsigned long long clen,
+                                    const unsigned char *n,
+                                    const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 SODIUM_EXPORT
-void crypto_secretbox_keygen(unsigned char k[crypto_secretbox_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_keygen (unsigned char k[crypto_secretbox_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_zerobytes(void);
+size_t  crypto_secretbox_zerobytes (void);
 
-#define crypto_secretbox_BOXZEROBYTES 
crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+#define crypto_secretbox_BOXZEROBYTES \
+  crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_boxzerobytes(void);
+size_t  crypto_secretbox_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_secretbox(unsigned char *c, const unsigned char *m,
-                     unsigned long long mlen, const unsigned char *n,
-                     const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_secretbox (unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                      5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
-                          unsigned long long clen, const unsigned char *n,
-                          const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open (unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xchacha20poly1305.h
index 6ec674e..509fac9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xchacha20poly1305.h
@@ -14,54 +14,55 @@ extern "C" {
 
 #define crypto_secretbox_xchacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_keybytes(void);
+size_t crypto_secretbox_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
+size_t crypto_secretbox_xchacha20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
+size_t crypto_secretbox_xchacha20poly1305_macbytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_secretbox_xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xchacha20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
-                                            const unsigned char *m,
-                                            unsigned long long mlen,
-                                            const unsigned char *n,
-                                            const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xchacha20poly1305_easy (unsigned char *c,
+                                             const unsigned char *m,
+                                             unsigned long long mlen,
+                                             const unsigned char *n,
+                                             const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_easy(unsigned char *m,
-                                                 const unsigned char *c,
-                                                 unsigned long long clen,
-                                                 const unsigned char *n,
-                                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xchacha20poly1305_open_easy (unsigned char *m,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
-                                                unsigned char *mac,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_xchacha20poly1305_detached (unsigned char *c,
+                                                 unsigned char *mac,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     const unsigned char *mac,
-                                                     unsigned long long clen,
-                                                     const unsigned char *n,
-                                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_xchacha20poly1305_open_detached (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      const unsigned char *mac,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index be0874c..18c9bfc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -14,53 +14,57 @@ extern "C" {
 
 #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_keybytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
-                                      const unsigned char *m,
-                                      unsigned long long mlen,
-                                      const unsigned char *n,
-                                      const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xsalsa20poly1305 (unsigned char *c,
+                                       const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n,
+                                       const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
-                                           const unsigned char *c,
-                                           unsigned long long clen,
-                                           const unsigned char *n,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xsalsa20poly1305_open (unsigned char *m,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *n,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char 
k[crypto_secretbox_xsalsa20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_xsalsa20poly1305_keygen (unsigned char
+                                               k[
+                                                 
crypto_secretbox_xsalsa20poly1305_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretstream_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretstream_xchacha20poly1305.h
index b22e4e9..6b8b135 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretstream_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_secretstream_xchacha20poly1305.h
@@ -15,91 +15,100 @@ extern "C" {
 #endif
 
 #define crypto_secretstream_xchacha20poly1305_ABYTES \
-    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+size_t crypto_secretstream_xchacha20poly1305_abytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
-    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+size_t crypto_secretstream_xchacha20poly1305_headerbytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_KEYBYTES \
-    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+size_t crypto_secretstream_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, 
\
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
               (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
-    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
-     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+  (crypto_secretstream_xchacha20poly1305_TAG_PUSH   \
+   | crypto_secretstream_xchacha20poly1305_TAG_REKEY)
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final (void);
 
-typedef struct crypto_secretstream_xchacha20poly1305_state {
-    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
-    unsigned char _pad[8];
+typedef struct crypto_secretstream_xchacha20poly1305_state
+{
+  unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+  unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+  unsigned char _pad[8];
 } crypto_secretstream_xchacha20poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+size_t crypto_secretstream_xchacha20poly1305_statebytes (void);
 
 SODIUM_EXPORT
 void crypto_secretstream_xchacha20poly1305_keygen
-   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
 int crypto_secretstream_xchacha20poly1305_init_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (crypto_secretstream_xchacha20poly1305_state * state,
+  unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *c, unsigned long long *clen_p,
-    const unsigned char *m, unsigned long long mlen,
-    const unsigned char *ad, unsigned long long adlen, unsigned char tag)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_push (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *c, unsigned long
+  long *clen_p,
+  const unsigned char *m, unsigned
+  long long mlen,
+  const unsigned char *ad,
+  unsigned long long adlen, unsigned char tag)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_init_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    const unsigned char 
header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_secretstream_xchacha20poly1305_init_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  const unsigned char
+  header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char
+  k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
-    const unsigned char *c, unsigned long long clen,
-    const unsigned char *ad, unsigned long long adlen)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *m, unsigned long
+  long *mlen_p, unsigned char *tag_p,
+  const unsigned char *c, unsigned
+  long long clen,
+  const unsigned char *ad,
+  unsigned long long adlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_secretstream_xchacha20poly1305_rekey
-    (crypto_secretstream_xchacha20poly1305_state *state);
+void crypto_secretstream_xchacha20poly1305_rekey (
+  crypto_secretstream_xchacha20poly1305_state *state);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash.h
index fecaa88..399538d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash.h
@@ -15,24 +15,24 @@ extern "C" {
 
 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_bytes(void);
+size_t  crypto_shorthash_bytes (void);
 
 #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_keybytes(void);
+size_t  crypto_shorthash_keybytes (void);
 
 #define crypto_shorthash_PRIMITIVE "siphash24"
 SODIUM_EXPORT
-const char *crypto_shorthash_primitive(void);
+const char *crypto_shorthash_primitive (void);
 
 SODIUM_EXPORT
-int crypto_shorthash(unsigned char *out, const unsigned char *in,
-                     unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash (unsigned char *out, const unsigned char *in,
+                      unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_shorthash_keygen (unsigned char k[crypto_shorthash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash_siphash24.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash_siphash24.h
index 1e6f72a..f179919 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash_siphash24.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_shorthash_siphash24.h
@@ -15,32 +15,35 @@ extern "C" {
 
 #define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_bytes(void);
+size_t crypto_shorthash_siphash24_bytes (void);
 
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_keybytes(void);
+size_t crypto_shorthash_siphash24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
-                               unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphash24 (unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned
+                                char *k)
+__attribute__ ((nonnull(1, 4)));
 
 #ifndef SODIUM_LIBRARY_MINIMAL
 /* -- 128-bit output -- */
 
 #define crypto_shorthash_siphashx24_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_bytes(void);
+size_t crypto_shorthash_siphashx24_bytes (void);
 
 #define crypto_shorthash_siphashx24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_keybytes(void);
+size_t crypto_shorthash_siphashx24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphashx24(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphashx24 (unsigned char *out, const unsigned char *in,
+                                 unsigned long long inlen, const unsigned
+                                 char *k)
+__attribute__ ((nonnull(1, 4)));
+
 #endif
 
 #ifdef __cplusplus
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign.h
index f5fafb1..9879476 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign.h
@@ -23,82 +23,84 @@ extern "C" {
 typedef crypto_sign_ed25519ph_state crypto_sign_state;
 
 SODIUM_EXPORT
-size_t  crypto_sign_statebytes(void);
+size_t  crypto_sign_statebytes (void);
 
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_sign_bytes(void);
+size_t  crypto_sign_bytes (void);
 
 #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_seedbytes(void);
+size_t  crypto_sign_seedbytes (void);
 
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_publickeybytes(void);
+size_t  crypto_sign_publickeybytes (void);
 
 #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_secretkeybytes(void);
+size_t  crypto_sign_secretkeybytes (void);
 
 #define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_sign_messagebytes_max(void);
+size_t  crypto_sign_messagebytes_max (void);
 
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
-const char *crypto_sign_primitive(void);
+const char *crypto_sign_primitive (void);
 
 SODIUM_EXPORT
-int crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                             const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_seed_keypair (unsigned char *pk, unsigned char *sk,
+                              const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-                const unsigned char *m, unsigned long long mlen,
-                const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
+int crypto_sign (unsigned char *sm, unsigned long long *smlen_p,
+                 const unsigned char *m, unsigned long long mlen,
+                 const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                     const unsigned char *sm, unsigned long long smlen,
-                     const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+int crypto_sign_open (unsigned char *m, unsigned long long *mlen_p,
+                      const unsigned char *sm, unsigned long long smlen,
+                      const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                         const unsigned char *m, unsigned long long mlen,
-                         const unsigned char *sk) __attribute__ ((nonnull(1, 
5)));
+int crypto_sign_detached (unsigned char *sig, unsigned long long *siglen_p,
+                          const unsigned char *m, unsigned long long mlen,
+                          const unsigned char *sk) __attribute__ ((nonnull(1,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_sign_verify_detached(const unsigned char *sig,
-                                const unsigned char *m,
-                                unsigned long long mlen,
-                                const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_verify_detached (const unsigned char *sig,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_init(crypto_sign_state *state);
+int crypto_sign_init (crypto_sign_state *state);
 
 SODIUM_EXPORT
-int crypto_sign_update(crypto_sign_state *state,
-                       const unsigned char *m, unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_update (crypto_sign_state *state,
+                        const unsigned char *m, unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                             unsigned long long *siglen_p,
-                             const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_final_create (crypto_sign_state *state, unsigned char *sig,
+                              unsigned long long *siglen_p,
+                              const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_final_verify(crypto_sign_state *state, const unsigned char 
*sig,
-                             const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_final_verify (crypto_sign_state *state, const unsigned
+                              char *sig,
+                              const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_ed25519.h
index 0fdac42..ba08826 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_ed25519.h
@@ -12,110 +12,112 @@
 extern "C" {
 #endif
 
-typedef struct crypto_sign_ed25519ph_state {
-    crypto_hash_sha512_state hs;
+typedef struct crypto_sign_ed25519ph_state
+{
+  crypto_hash_sha512_state hs;
 } crypto_sign_ed25519ph_state;
 
 SODIUM_EXPORT
-size_t crypto_sign_ed25519ph_statebytes(void);
+size_t crypto_sign_ed25519ph_statebytes (void);
 
 #define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_bytes(void);
+size_t crypto_sign_ed25519_bytes (void);
 
 #define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_seedbytes(void);
+size_t crypto_sign_ed25519_seedbytes (void);
 
 #define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_publickeybytes(void);
+size_t crypto_sign_ed25519_publickeybytes (void);
 
 #define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_secretkeybytes(void);
+size_t crypto_sign_ed25519_secretkeybytes (void);
 
-#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - 
crypto_sign_ed25519_BYTES)
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                              - crypto_sign_ed25519_BYTES)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_messagebytes_max(void);
+size_t crypto_sign_ed25519_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *sk)
-            __attribute__ ((nonnull(1, 5)));
+int crypto_sign_ed25519 (unsigned char *sm, unsigned long long *smlen_p,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+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)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((nonnull(1, 5)));
+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)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_ed25519_verify_detached (const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                     const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_seed_keypair (unsigned char *pk, unsigned char *sk,
+                                      const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                         const unsigned char *ed25519_pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519_pk_to_curve25519 (unsigned char *curve25519_pk,
+                                          const unsigned char *ed25519_pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                         const unsigned char *ed25519_sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_curve25519 (unsigned char *curve25519_sk,
+                                          const unsigned char *ed25519_sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_seed(unsigned char *seed,
-                                   const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_seed (unsigned char *seed,
+                                    const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_pk (unsigned char *pk, const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_init (crypto_sign_ed25519ph_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                                 const unsigned char *m,
-                                 unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_ed25519ph_update (crypto_sign_ed25519ph_state *state,
+                                  const unsigned char *m,
+                                  unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                       unsigned char *sig,
-                                       unsigned long long *siglen_p,
-                                       const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_ed25519ph_final_create (crypto_sign_ed25519ph_state *state,
+                                        unsigned char *sig,
+                                        unsigned long long *siglen_p,
+                                        const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                       const unsigned char *sig,
-                                       const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_final_verify (crypto_sign_ed25519ph_state *state,
+                                        const unsigned char *sig,
+                                        const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_edwards25519sha512batch.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_edwards25519sha512batch.h
index eed158a..bcfba7b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -25,28 +25,30 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
-#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX 
- crypto_sign_edwards25519sha512batch_BYTES)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                                              - \
+                                                              
crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *sm,
-                                        unsigned long long *smlen_p,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
+int crypto_sign_edwards25519sha512batch (unsigned char *sm,
+                                         unsigned long long *smlen_p,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
+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)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                                unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_sign_edwards25519sha512batch_keypair (unsigned char *pk,
+                                                 unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream.h
index 88dab5f..c8efcdc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream.h
@@ -23,34 +23,34 @@ extern "C" {
 
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_keybytes(void);
+size_t  crypto_stream_keybytes (void);
 
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_noncebytes(void);
+size_t  crypto_stream_noncebytes (void);
 
 #define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_stream_messagebytes_max(void);
+size_t  crypto_stream_messagebytes_max (void);
 
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
-const char *crypto_stream_primitive(void);
+const char *crypto_stream_primitive (void);
 
 SODIUM_EXPORT
-int crypto_stream(unsigned char *c, unsigned long long clen,
-                  const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream (unsigned char *c, unsigned long long clen,
+                   const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xor(unsigned char *c, const unsigned char *m,
-                      unsigned long long mlen, const unsigned char *n,
-                      const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xor (unsigned char *c, const unsigned char *m,
+                       unsigned long long mlen, const unsigned char *n,
+                       const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_keygen (unsigned char k[crypto_stream_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_chacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_chacha20.h
index 4088975..e276a7d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_chacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_chacha20.h
@@ -22,82 +22,89 @@ extern "C" {
 
 #define crypto_stream_chacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_keybytes(void);
+size_t crypto_stream_chacha20_keybytes (void);
 
 #define crypto_stream_chacha20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_noncebytes(void);
+size_t crypto_stream_chacha20_noncebytes (void);
 
 #define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_messagebytes_max(void);
+size_t crypto_stream_chacha20_messagebytes_max (void);
 
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
-int crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_keygen(unsigned char 
k[crypto_stream_chacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_keygen (unsigned char
+                                    k[crypto_stream_chacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
 
 #define crypto_stream_chacha20_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_keybytes(void);
+size_t crypto_stream_chacha20_ietf_keybytes (void);
 
 #define crypto_stream_chacha20_ietf_NONCEBYTES 12U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_noncebytes(void);
+size_t crypto_stream_chacha20_ietf_noncebytes (void);
 
 #define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+  SODIUM_MIN (SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+size_t crypto_stream_chacha20_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf (unsigned char *c, unsigned long long clen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
-                                    unsigned long long mlen, const unsigned 
char *n,
-                                    const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor (unsigned char *c, const unsigned char *m,
+                                     unsigned long long mlen, const unsigned
+                                     char *n,
+                                     const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char 
*m,
-                                       unsigned long long mlen,
-                                       const unsigned char *n, uint32_t ic,
-                                       const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor_ic (unsigned char *c, const unsigned
+                                        char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *n, uint32_t ic,
+                                        const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_ietf_keygen(unsigned char 
k[crypto_stream_chacha20_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_ietf_keygen (unsigned char
+                                         
k[crypto_stream_chacha20_ietf_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_stream_chacha20_IETF_KEYBYTES 
crypto_stream_chacha20_ietf_KEYBYTES
-#define crypto_stream_chacha20_IETF_NONCEBYTES 
crypto_stream_chacha20_ietf_NONCEBYTES
-#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX 
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+#define crypto_stream_chacha20_IETF_KEYBYTES \
+  crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES \
+  crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX \
+  crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa20.h
index 45b3b3e..e677477 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_keybytes(void);
+size_t crypto_stream_salsa20_keybytes (void);
 
 #define crypto_stream_salsa20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_noncebytes(void);
+size_t crypto_stream_salsa20_noncebytes (void);
 
 #define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_messagebytes_max(void);
+size_t crypto_stream_salsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
-                          const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20 (unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
-                              unsigned long long mlen, const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor (unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                 unsigned long long mlen,
-                                 const unsigned char *n, uint64_t ic,
-                                 const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa20_keygen(unsigned char 
k[crypto_stream_salsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa20_keygen (unsigned char
+                                   k[crypto_stream_salsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa2012.h
index 6c5d303..66545d1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa2012.h
@@ -21,30 +21,32 @@ extern "C" {
 
 #define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_keybytes(void);
+size_t crypto_stream_salsa2012_keybytes (void);
 
 #define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_noncebytes(void);
+size_t crypto_stream_salsa2012_noncebytes (void);
 
 #define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_messagebytes_max(void);
+size_t crypto_stream_salsa2012_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa2012_keygen(unsigned char 
k[crypto_stream_salsa2012_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa2012_keygen (unsigned char
+                                     k[crypto_stream_salsa2012_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa208.h
index d574f30..00ee015 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_salsa208.h
@@ -21,33 +21,34 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_noncebytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
-    SODIUM_EXPORT
-size_t crypto_stream_salsa208_messagebytes_max(void)
-            __attribute__ ((deprecated));
+SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char 
k[crypto_stream_salsa208_KEYBYTES])
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+void crypto_stream_salsa208_keygen (unsigned char
+                                    k[crypto_stream_salsa208_KEYBYTES])
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xchacha20.h
index c4002db..a42ba70 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xchacha20.h
@@ -22,37 +22,39 @@ extern "C" {
 
 #define crypto_stream_xchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_keybytes(void);
+size_t crypto_stream_xchacha20_keybytes (void);
 
 #define crypto_stream_xchacha20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_noncebytes(void);
+size_t crypto_stream_xchacha20_noncebytes (void);
 
 #define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_messagebytes_max(void);
+size_t crypto_stream_xchacha20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                   unsigned long long mlen,
-                                   const unsigned char *n, uint64_t ic,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen,
+                                    const unsigned char *n, uint64_t ic,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xchacha20_keygen(unsigned char 
k[crypto_stream_xchacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xchacha20_keygen (unsigned char
+                                     k[crypto_stream_xchacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xsalsa20.h
index 20034e3..60b0233 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_stream_xsalsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_keybytes(void);
+size_t crypto_stream_xsalsa20_keybytes (void);
 
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_noncebytes(void);
+size_t crypto_stream_xsalsa20_noncebytes (void);
 
 #define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_messagebytes_max(void);
+size_t crypto_stream_xsalsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xsalsa20_keygen(unsigned char 
k[crypto_stream_xsalsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xsalsa20_keygen (unsigned char
+                                    k[crypto_stream_xsalsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_16.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_16.h
index 7b9c807..ec377fd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_16.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_16.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_verify_16_bytes(void);
+size_t crypto_verify_16_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_16 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_32.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_32.h
index 9b0f452..03fa394 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_32.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_32.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_verify_32_bytes(void);
+size_t crypto_verify_32_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_32 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_64.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_64.h
index c83b730..fe18a74 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_64.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/crypto_verify_64.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_64_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_verify_64_bytes(void);
+size_t crypto_verify_64_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_64 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/export.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/export.h
index a0074fc..d943e3e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/export.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/export.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_export_H
 #define sodium_export_H
 
@@ -6,7 +5,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if ! defined(__clang__) && ! defined(__GNUC__)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
@@ -26,7 +25,7 @@
 # else
 #  if defined(__SUNPRO_C)
 #   ifndef __GNU_C__
-#    define SODIUM_EXPORT __attribute__ (visibility(__global))
+#    define SODIUM_EXPORT __attribute__ (visibility (__global))
 #   else
 #    define SODIUM_EXPORT __attribute__ __global
 #   endif
@@ -36,7 +35,7 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
-# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+# if defined(__ELF__) && ! defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
 # else
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
@@ -45,13 +44,13 @@
 
 #ifndef CRYPTO_ALIGN
 # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
-#  define CRYPTO_ALIGN(x) __declspec(align(x))
+#  define CRYPTO_ALIGN(x) __declspec(align (x))
 # else
-#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned (x)))
 # endif
 #endif
 
 #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#define SODIUM_SIZE_MAX SODIUM_MIN (UINT64_MAX, SIZE_MAX)
 
 #endif
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes.h
index c83a4df..3539ac8 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_H
 #define randombytes_H
 
@@ -16,54 +15,56 @@
 extern "C" {
 #endif
 
-typedef struct randombytes_implementation {
-    const char *(*implementation_name)(void); /* required */
-    uint32_t    (*random)(void);              /* required */
-    void        (*stir)(void);                /* optional */
-    uint32_t    (*uniform)(const uint32_t upper_bound); /* optional, a default 
implementation will be used if NULL */
-    void        (*buf)(void * const buf, const size_t size); /* required */
-    int         (*close)(void);               /* optional */
+typedef struct randombytes_implementation
+{
+  const char *(*implementation_name)(void);   /* required */
+  uint32_t (*random)(void);                   /* required */
+  void (*stir)(void);                         /* optional */
+  uint32_t (*uniform)(const uint32_t upper_bound);      /* optional, a default 
implementation will be used if NULL */
+  void (*buf)(void *const buf, const size_t size);           /* required */
+  int (*close)(void);                         /* optional */
 } randombytes_implementation;
 
-#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+#define randombytes_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, 0xffffffffUL)
 
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t randombytes_seedbytes(void);
+size_t randombytes_seedbytes (void);
 
 SODIUM_EXPORT
-void randombytes_buf(void * const buf, const size_t size)
-            __attribute__ ((nonnull));
+void randombytes_buf (void *const buf, const size_t size)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void randombytes_buf_deterministic(void * const buf, const size_t size,
-                                   const unsigned char 
seed[randombytes_SEEDBYTES])
-            __attribute__ ((nonnull));
+void randombytes_buf_deterministic (void *const buf, const size_t size,
+                                    const unsigned char
+                                    seed[randombytes_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-uint32_t randombytes_random(void);
+uint32_t randombytes_random (void);
 
 SODIUM_EXPORT
-uint32_t randombytes_uniform(const uint32_t upper_bound);
+uint32_t randombytes_uniform (const uint32_t upper_bound);
 
 SODIUM_EXPORT
-void randombytes_stir(void);
+void randombytes_stir (void);
 
 SODIUM_EXPORT
-int randombytes_close(void);
+int randombytes_close (void);
 
 SODIUM_EXPORT
-int randombytes_set_implementation(const randombytes_implementation *impl)
-            __attribute__ ((nonnull));
+int randombytes_set_implementation (const randombytes_implementation *impl)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-const char *randombytes_implementation_name(void);
+const char *randombytes_implementation_name (void);
 
 /* -- NaCl compatibility interface -- */
 
 SODIUM_EXPORT
-void randombytes(unsigned char * const buf, const unsigned long long buf_len)
-            __attribute__ ((nonnull));
+void randombytes (unsigned char *const buf, const unsigned long long buf_len)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_internal_random.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_internal_random.h
index 2b2b7d6..d9cd6b0 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_internal_random.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_internal_random.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_internal_random_H
 #define randombytes_internal_random_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_sysrandom.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_sysrandom.h
index 9e27b67..ebb284f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_sysrandom.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/randombytes_sysrandom.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_sysrandom_H
 #define randombytes_sysrandom_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/runtime.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/runtime.h
index c1cec85..471d71b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/runtime.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/runtime.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_runtime_H
 #define sodium_runtime_H
 
@@ -9,44 +8,44 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_neon(void);
+int sodium_runtime_has_neon (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_armcrypto(void);
+int sodium_runtime_has_armcrypto (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse2(void);
+int sodium_runtime_has_sse2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse3(void);
+int sodium_runtime_has_sse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_ssse3(void);
+int sodium_runtime_has_ssse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse41(void);
+int sodium_runtime_has_sse41 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx(void);
+int sodium_runtime_has_avx (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx2(void);
+int sodium_runtime_has_avx2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx512f(void);
+int sodium_runtime_has_avx512f (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_pclmul(void);
+int sodium_runtime_has_pclmul (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_aesni(void);
+int sodium_runtime_has_aesni (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_rdrand(void);
+int sodium_runtime_has_rdrand (void);
 
 /* ------------------------------------------------------------------------- */
 
-int _sodium_runtime_get_cpu_features(void);
+int _sodium_runtime_get_cpu_features (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/utils.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/utils.h
index f9b3697..39b121d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/utils.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/utils.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_utils_H
 #define sodium_utils_H
 
@@ -11,7 +10,8 @@ extern "C" {
 #endif
 
 #ifndef SODIUM_C99
-# if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 
199901L
+# if defined(__cplusplus) || ! defined(__STDC_VERSION__) || __STDC_VERSION__ < 
\
+  199901L
 #  define SODIUM_C99(X)
 # else
 #  define SODIUM_C99(X) X
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-void sodium_memzero(void * const pnt, const size_t len);
+void sodium_memzero (void *const pnt, const size_t len);
 
 SODIUM_EXPORT
-void sodium_stackzero(const size_t len);
+void sodium_stackzero (const size_t len);
 
 /*
  * WARNING: sodium_memcmp() must be used to verify if two secret keys
@@ -31,8 +31,8 @@ void sodium_stackzero(const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
-            __attribute__ ((warn_unused_result));
+int sodium_memcmp (const void *const b1_, const void *const b2_, size_t len)
+__attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -41,32 +41,32 @@ int sodium_memcmp(const void * const b1_, const void * 
const b2_, size_t len)
  * However, it is slower than sodium_memcmp().
  */
 SODIUM_EXPORT
-int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len) __attribute__ ((warn_unused_result));
+int sodium_compare (const unsigned char *b1_, const unsigned char *b2_,
+                    size_t len) __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int sodium_is_zero(const unsigned char *n, const size_t nlen);
+int sodium_is_zero (const unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_increment(unsigned char *n, const size_t nlen);
+void sodium_increment (unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_add(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_add (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-void sodium_sub(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_sub (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,
-                     const unsigned char * const bin, const size_t bin_len)
-            __attribute__ ((nonnull(1)));
+char *sodium_bin2hex (char *const hex, const size_t hex_maxlen,
+                      const unsigned char *const bin, const size_t bin_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
-                   const char * const hex, const size_t hex_len,
-                   const char * const ignore, size_t * const bin_len,
-                   const char ** const hex_end)
-            __attribute__ ((nonnull(1)));
+int sodium_hex2bin (unsigned char *const bin, const size_t bin_maxlen,
+                    const char *const hex, const size_t hex_len,
+                    const char *const ignore, size_t *const bin_len,
+                    const char **const hex_end)
+__attribute__ ((nonnull(1)));
 
 #define sodium_base64_VARIANT_ORIGINAL            1
 #define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
@@ -78,32 +78,35 @@ int sodium_hex2bin(unsigned char * const bin, const size_t 
bin_maxlen,
  * using the given variant. The computed length includes a trailing \0.
  */
 #define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT) \
-    (((BIN_LEN) / 3U) * 4U + \
-    ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 
3U) >> 1)) & 1U) * \
-     (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) - ((BIN_LEN) / 
3U) * 3U)))) + 1U)
+  (((BIN_LEN) / 3U) * 4U   \
+   + ((((BIN_LEN) -((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) -((BIN_LEN) / 3U) \
+                                              * 3U) >> 1)) & 1U)   \
+   * (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) -((BIN_LEN) \
+                                                                 / 3U) \
+                                                     * 3U)))) + 1U)
 
 SODIUM_EXPORT
-size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+size_t sodium_base64_encoded_len (const size_t bin_len, const int variant);
 
 SODIUM_EXPORT
-char *sodium_bin2base64(char * const b64, const size_t b64_maxlen,
-                        const unsigned char * const bin, const size_t bin_len,
-                        const int variant) __attribute__ ((nonnull(1)));
+char *sodium_bin2base64 (char *const b64, const size_t b64_maxlen,
+                         const unsigned char *const bin, const size_t bin_len,
+                         const int variant) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_base642bin(unsigned char * const bin, const size_t bin_maxlen,
-                      const char * const b64, const size_t b64_len,
-                      const char * const ignore, size_t * const bin_len,
-                      const char ** const b64_end, const int variant)
-            __attribute__ ((nonnull(1)));
+int sodium_base642bin (unsigned char *const bin, const size_t bin_maxlen,
+                       const char *const b64, const size_t b64_len,
+                       const char *const ignore, size_t *const bin_len,
+                       const char **const b64_end, const int variant)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_mlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_mlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_munlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_munlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 /* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
  * allocation functions.
@@ -139,38 +142,38 @@ int sodium_munlock(void * const addr, const size_t len)
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size)
-            __attribute__ ((malloc));
+void *sodium_malloc (const size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size)
-            __attribute__ ((malloc));
+void *sodium_allocarray (size_t count, size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void sodium_free(void *ptr);
+void sodium_free (void *ptr);
 
 SODIUM_EXPORT
-int sodium_mprotect_noaccess(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_noaccess (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readonly(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readonly (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readwrite(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readwrite (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
-               size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
-            __attribute__ ((nonnull(2)));
+int sodium_pad (size_t *padded_buflen_p, unsigned char *buf,
+                size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+__attribute__ ((nonnull(2)));
 
 SODIUM_EXPORT
-int sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
-                 size_t padded_buflen, size_t blocksize)
-            __attribute__ ((nonnull(2)));
+int sodium_unpad (size_t *unpadded_buflen_p, const unsigned char *buf,
+                  size_t padded_buflen, size_t blocksize)
+__attribute__ ((nonnull(2)));
 
 /* -------- */
 
-int _sodium_alloc_init(void);
+int _sodium_alloc_init (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/version.h
 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/version.h
index 022ab11..cec1b92 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/version.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/armeabi-v7a/include/sodium/version.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_version_H
 #define sodium_version_H
 
@@ -15,16 +14,16 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-const char *sodium_version_string(void);
+const char *sodium_version_string (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_major(void);
+int         sodium_library_version_major (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_minor(void);
+int         sodium_library_version_minor (void);
 
 SODIUM_EXPORT
-int         sodium_library_minimal(void);
+int         sodium_library_minimal (void);
 
 #ifdef __cplusplus
 }
diff --git a/verification-app/app/src/main/cpp/libsodium/include/sodium.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium.h
index 86b7a4d..f11f028 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_H
 #define sodium_H
 
diff --git a/verification-app/app/src/main/cpp/libsodium/include/sodium/core.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/core.h
index dd088d2..921c7e6 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/core.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/core.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_core_H
 #define sodium_core_H
 
@@ -9,17 +8,17 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int sodium_init(void)
-            __attribute__ ((warn_unused_result));
+int sodium_init (void)
+__attribute__ ((warn_unused_result));
 
 /* ---- */
 
 SODIUM_EXPORT
-int sodium_set_misuse_handler(void (*handler)(void));
+int sodium_set_misuse_handler (void (*handler)(void));
 
 SODIUM_EXPORT
-void sodium_misuse(void)
-            __attribute__ ((noreturn));
+void sodium_misuse (void)
+__attribute__ ((noreturn));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis128l.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis128l.h
index 0ad019f..ba8a2c6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis128l.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis128l.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis128l_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_keybytes(void);
+size_t crypto_aead_aegis128l_keybytes (void);
 
 #define crypto_aead_aegis128l_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_nsecbytes(void);
+size_t crypto_aead_aegis128l_nsecbytes (void);
 
 #define crypto_aead_aegis128l_NPUBBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_npubbytes(void);
+size_t crypto_aead_aegis128l_npubbytes (void);
 
 #define crypto_aead_aegis128l_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_abytes(void);
+size_t crypto_aead_aegis128l_abytes (void);
 
 #define crypto_aead_aegis128l_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 
1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_messagebytes_max(void);
+size_t crypto_aead_aegis128l_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt(unsigned char       *c,
-                                  unsigned long long  *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long   mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis128l_encrypt (unsigned char       *c,
+                                   unsigned long long  *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt(unsigned char       *m,
-                                  unsigned long long  *mlen_p,
-                                  unsigned char       *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long   clen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis128l_decrypt (unsigned char       *m,
+                                   unsigned long long  *mlen_p,
+                                   unsigned char       *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt_detached(unsigned char       *c,
-                                           unsigned char       *mac,
-                                           unsigned long long  *maclen_p,
-                                           const unsigned char *m,
-                                           unsigned long long   mlen,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *nsec,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis128l_encrypt_detached (unsigned char       *c,
+                                            unsigned char       *mac,
+                                            unsigned long long  *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt_detached(unsigned char       *m,
-                                           unsigned char       *nsec,
-                                           const unsigned char *c,
-                                           unsigned long long   clen,
-                                           const unsigned char *mac,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis128l_decrypt_detached (unsigned char       *m,
+                                            unsigned char       *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis128l_keygen(unsigned char 
k[crypto_aead_aegis128l_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis128l_keygen (unsigned char
+                                   k[crypto_aead_aegis128l_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis256.h
index 26bd18a..6b3feff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aegis256.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_keybytes(void);
+size_t crypto_aead_aegis256_keybytes (void);
 
 #define crypto_aead_aegis256_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_nsecbytes(void);
+size_t crypto_aead_aegis256_nsecbytes (void);
 
 #define crypto_aead_aegis256_NPUBBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_npubbytes(void);
+size_t crypto_aead_aegis256_npubbytes (void);
 
 #define crypto_aead_aegis256_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_abytes(void);
+size_t crypto_aead_aegis256_abytes (void);
 
 #define crypto_aead_aegis256_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_messagebytes_max(void);
+size_t crypto_aead_aegis256_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt(unsigned char       *c,
-                                 unsigned long long  *clen_p,
-                                 const unsigned char *m,
-                                 unsigned long long   mlen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *nsec,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis256_encrypt (unsigned char       *c,
+                                  unsigned long long  *clen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *nsec,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt(unsigned char       *m,
-                                 unsigned long long  *mlen_p,
-                                 unsigned char       *nsec,
-                                 const unsigned char *c,
-                                 unsigned long long   clen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis256_decrypt (unsigned char       *m,
+                                  unsigned long long  *mlen_p,
+                                  unsigned char       *nsec,
+                                  const unsigned char *c,
+                                  unsigned long long clen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt_detached(unsigned char       *c,
-                                          unsigned char       *mac,
-                                          unsigned long long  *maclen_p,
-                                          const unsigned char *m,
-                                          unsigned long long   mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis256_encrypt_detached (unsigned char       *c,
+                                           unsigned char       *mac,
+                                           unsigned long long  *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt_detached(unsigned char       *m,
-                                          unsigned char       *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long   clen,
-                                          const unsigned char *mac,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis256_decrypt_detached (unsigned char       *m,
+                                           unsigned char       *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis256_keygen(unsigned char 
k[crypto_aead_aegis256_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis256_keygen (unsigned char
+                                  k[crypto_aead_aegis256_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aes256gcm.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aes256gcm.h
index 9baeb3f..5d259ff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aes256gcm.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_aes256gcm.h
@@ -32,145 +32,154 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_is_available(void);
+int crypto_aead_aes256gcm_is_available (void);
 
 #define crypto_aead_aes256gcm_KEYBYTES  32U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_keybytes(void);
+size_t crypto_aead_aes256gcm_keybytes (void);
 
 #define crypto_aead_aes256gcm_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_nsecbytes(void);
+size_t crypto_aead_aes256gcm_nsecbytes (void);
 
 #define crypto_aead_aes256gcm_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_npubbytes(void);
+size_t crypto_aead_aes256gcm_npubbytes (void);
 
 #define crypto_aead_aes256gcm_ABYTES    16U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_abytes(void);
+size_t crypto_aead_aes256gcm_abytes (void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)))
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
+              (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_messagebytes_max(void);
+size_t crypto_aead_aes256gcm_messagebytes_max (void);
 
-typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_ {
-    unsigned char opaque[512];
+typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_
+{
+  unsigned char opaque[512];
 } crypto_aead_aes256gcm_state;
 
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_statebytes(void);
+size_t crypto_aead_aes256gcm_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt(unsigned char *c,
-                                  unsigned long long *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_aes256gcm_encrypt (unsigned char *c,
+                                   unsigned long long *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt (unsigned char *m,
+                                   unsigned long long *mlen_p,
+                                   unsigned char *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached (unsigned char *c,
+                                            unsigned char *mac,
+                                            unsigned long long *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached (unsigned char *m,
+                                            unsigned char *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+/* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt(unsigned char *m,
-                                  unsigned long long *mlen_p,
-                                  unsigned char *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long clen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_aes256gcm_beforenm (crypto_aead_aes256gcm_state *ctx_,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
-                                           unsigned char *mac,
-                                           unsigned long long *maclen_p,
+int crypto_aead_aes256gcm_encrypt_afternm (unsigned char *c,
+                                           unsigned long long *clen_p,
                                            const unsigned char *m,
                                            unsigned long long mlen,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *nsec,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+int crypto_aead_aes256gcm_decrypt_afternm (unsigned char *m,
+                                           unsigned long long *mlen_p,
                                            unsigned char *nsec,
                                            const unsigned char *c,
                                            unsigned long long clen,
-                                           const unsigned char *mac,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-/* -- Precomputation interface -- */
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_afternm(unsigned char *c,
-                                          unsigned long long *clen_p,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
-                                          unsigned long long *mlen_p,
-                                          unsigned char *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long clen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
-                                                   unsigned char *mac,
-                                                   unsigned long long 
*maclen_p,
-                                                   const unsigned char *m,
-                                                   unsigned long long mlen,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *nsec,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
-                                                   unsigned char *nsec,
-                                                   const unsigned char *c,
-                                                   unsigned long long clen,
-                                                   const unsigned char *mac,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_aes256gcm_keygen(unsigned char 
k[crypto_aead_aes256gcm_KEYBYTES])
-            __attribute__ ((nonnull));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm (unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long
+                                                    long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm (unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_aes256gcm_keygen (unsigned char
+                                   k[crypto_aead_aes256gcm_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_chacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_chacha20poly1305.h
index 5d671df..686f5aa 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_chacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_chacha20poly1305.h
@@ -15,163 +15,181 @@ extern "C" {
 
 #define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
 
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * ((1ULL << 32) - 1ULL)))
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                       unsigned char *mac,
-                                                       unsigned long long 
*maclen_p,
-                                                       const unsigned char *m,
-                                                       unsigned long long mlen,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*nsec,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                       unsigned char *nsec,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char 
*mac,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+              (64ULL * ((1ULL << 32) - 1ULL)))
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt (unsigned char *c,
+                                               unsigned long long *clen_p,
+                                               const unsigned char *m,
+                                               unsigned long long mlen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *nsec,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt (unsigned char *m,
+                                               unsigned long long *mlen_p,
+                                               unsigned char *nsec,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                        unsigned char *mac,
+                                                        unsigned long
+                                                        long *maclen_p,
+                                                        const unsigned char *m,
+                                                        unsigned long long 
mlen,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *nsec,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                        unsigned char *nsec,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned
+                                                        char *mac,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_ietf_keygen (unsigned char
+                                               k[
+                                                 
crypto_aead_chacha20poly1305_ietf_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit 
internal counter -- */
 
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_keybytes(void);
+size_t crypto_aead_chacha20poly1305_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_NPUBBYTES 8U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_abytes(void);
+size_t crypto_aead_chacha20poly1305_abytes (void);
 
 #define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
-                                         unsigned long long *clen_p,
-                                         const unsigned char *m,
-                                         unsigned long long mlen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *nsec,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
-                                         unsigned long long *mlen_p,
-                                         unsigned char *nsec,
-                                         const unsigned char *c,
-                                         unsigned long long clen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
-                                                  unsigned char *mac,
-                                                  unsigned long long *maclen_p,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *nsec,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
-                                                  unsigned char *nsec,
-                                                  const unsigned char *c,
-                                                  unsigned long long clen,
-                                                  const unsigned char *mac,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt (unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt (unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt_detached (unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long 
*maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt_detached (unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_keygen (unsigned char
+                                          k[
+                                            
crypto_aead_chacha20poly1305_KEYBYTES
+                                          ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         
crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        
crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        
crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES           
crypto_aead_chacha20poly1305_ietf_ABYTES
-#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           \
+  crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h
index 6643b0c..6bdd39f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h
@@ -13,85 +13,104 @@ extern "C" {
 
 #define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
-                                               unsigned long long *clen_p,
-                                               const unsigned char *m,
-                                               unsigned long long mlen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *nsec,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt (unsigned char *c,
+                                                unsigned long long *clen_p,
+                                                const unsigned char *m,
+                                                unsigned long long mlen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *nsec,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
-                                               unsigned long long *mlen_p,
-                                               unsigned char *nsec,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt (unsigned char *m,
+                                                unsigned long long *mlen_p,
+                                                unsigned char *nsec,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                        unsigned char *mac,
-                                                        unsigned long long 
*maclen_p,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*nsec,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                         unsigned char *mac,
+                                                         unsigned long
+                                                         long *maclen_p,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *nsec,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                        unsigned char *nsec,
-                                                        const unsigned char *c,
-                                                        unsigned long long 
clen,
-                                                        const unsigned char 
*mac,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                         unsigned char *nsec,
+                                                         const unsigned char 
*c,
+                                                         unsigned long long
+                                                         clen,
+                                                         const unsigned
+                                                         char *mac,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_aead_xchacha20poly1305_ietf_keygen (unsigned char
+                                                k[
+                                                  
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+                                                ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        
crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        
crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES           
crypto_aead_xchacha20poly1305_ietf_ABYTES
-#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           \
+  crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth.h
index 540aee0..ef7e5d9 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth.h
@@ -15,29 +15,29 @@ extern "C" {
 
 #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
 SODIUM_EXPORT
-size_t  crypto_auth_bytes(void);
+size_t  crypto_auth_bytes (void);
 
 #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_auth_keybytes(void);
+size_t  crypto_auth_keybytes (void);
 
 #define crypto_auth_PRIMITIVE "hmacsha512256"
 SODIUM_EXPORT
-const char *crypto_auth_primitive(void);
+const char *crypto_auth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_auth(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_auth (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_verify (const unsigned char *h, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_auth_keygen(unsigned char k[crypto_auth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_keygen (unsigned char k[crypto_auth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha256.h
index 3da864c..925d0cc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha256.h
@@ -14,54 +14,57 @@ extern "C" {
 
 #define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_bytes(void);
+size_t crypto_auth_hmacsha256_bytes (void);
 
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_keybytes(void);
+size_t crypto_auth_hmacsha256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha256_state {
-    crypto_hash_sha256_state ictx;
-    crypto_hash_sha256_state octx;
+typedef struct crypto_auth_hmacsha256_state
+{
+  crypto_hash_sha256_state ictx;
+  crypto_hash_sha256_state octx;
 } crypto_auth_hmacsha256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_statebytes(void);
+size_t crypto_auth_hmacsha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_init (crypto_auth_hmacsha256_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_auth_hmacsha256_update (crypto_auth_hmacsha256_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_final (crypto_auth_hmacsha256_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha256_keygen(unsigned char 
k[crypto_auth_hmacsha256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha256_keygen (unsigned char
+                                    k[crypto_auth_hmacsha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512.h
index d992cb8..e5fd3ca 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512.h
@@ -14,52 +14,56 @@ extern "C" {
 
 #define crypto_auth_hmacsha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_bytes(void);
+size_t crypto_auth_hmacsha512_bytes (void);
 
 #define crypto_auth_hmacsha512_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_keybytes(void);
+size_t crypto_auth_hmacsha512_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha512_state {
-    crypto_hash_sha512_state ictx;
-    crypto_hash_sha512_state octx;
+typedef struct crypto_auth_hmacsha512_state
+{
+  crypto_hash_sha512_state ictx;
+  crypto_hash_sha512_state octx;
 } crypto_auth_hmacsha512_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_statebytes(void);
+size_t crypto_auth_hmacsha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_init (crypto_auth_hmacsha512_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512_update (crypto_auth_hmacsha512_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_final (crypto_auth_hmacsha512_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512_keygen(unsigned char 
k[crypto_auth_hmacsha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512_keygen (unsigned char
+                                    k[crypto_auth_hmacsha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512256.h
index 3fb5263..25a0787 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_auth_hmacsha512256.h
@@ -14,49 +14,53 @@ extern "C" {
 
 #define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_bytes(void);
+size_t crypto_auth_hmacsha512256_bytes (void);
 
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_keybytes(void);
+size_t crypto_auth_hmacsha512256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *out,
-                              const unsigned char *in,
-                              unsigned long long inlen,
-                              const unsigned char *k) __attribute__ 
((nonnull(1, 4)));
+int crypto_auth_hmacsha512256 (unsigned char *out,
+                               const unsigned char *in,
+                               unsigned long long inlen,
+                               const unsigned char *k) __attribute__ (
+  (nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *h,
-                                     const unsigned char *in,
-                                     unsigned long long inlen,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512256_verify (const unsigned char *h,
+                                      const unsigned char *in,
+                                      unsigned long long inlen,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
 typedef crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_statebytes(void);
+size_t crypto_auth_hmacsha512256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
-                                   const unsigned char *key,
-                                   size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512256_init (crypto_auth_hmacsha512256_state *state,
+                                    const unsigned char *key,
+                                    size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
-                                     const unsigned char *in,
-                                     unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512256_update (crypto_auth_hmacsha512256_state *state,
+                                      const unsigned char *in,
+                                      unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
-                                    unsigned char *out) __attribute__ 
((nonnull));
+int crypto_auth_hmacsha512256_final (crypto_auth_hmacsha512256_state *state,
+                                     unsigned char *out) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512256_keygen(unsigned char 
k[crypto_auth_hmacsha512256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512256_keygen (unsigned char
+                                       k[crypto_auth_hmacsha512256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box.h
index e060dd2..41190bd 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box.h
@@ -22,153 +22,164 @@ extern "C" {
 
 #define crypto_box_SEEDBYTES crypto_box_curve25519xsalsa20poly1305_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_box_seedbytes(void);
+size_t  crypto_box_seedbytes (void);
 
-#define crypto_box_PUBLICKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_PUBLICKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_publickeybytes(void);
+size_t  crypto_box_publickeybytes (void);
 
-#define crypto_box_SECRETKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_SECRETKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_secretkeybytes(void);
+size_t  crypto_box_secretkeybytes (void);
 
 #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_box_noncebytes(void);
+size_t  crypto_box_noncebytes (void);
 
 #define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_box_macbytes(void);
+size_t  crypto_box_macbytes (void);
 
-#define crypto_box_MESSAGEBYTES_MAX 
crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_box_MESSAGEBYTES_MAX \
+  crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_box_messagebytes_max(void);
+size_t  crypto_box_messagebytes_max (void);
 
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_box_primitive(void);
+const char *crypto_box_primitive (void);
 
 SODIUM_EXPORT
-int crypto_box_seed_keypair(unsigned char *pk, unsigned char *sk,
-                            const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_box_seed_keypair (unsigned char *pk, unsigned char *sk,
+                             const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_easy (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen, const unsigned char *n,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open_easy (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen, const unsigned char *n,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_detached(unsigned char *c, unsigned char *mac,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
+int crypto_box_detached (unsigned char *c, unsigned char *mac,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *n, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
-                             const unsigned char *mac,
-                             unsigned long long clen,
-                             const unsigned char *n,
-                             const unsigned char *pk,
-                             const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+int crypto_box_open_detached (unsigned char *m, const unsigned char *c,
+                              const unsigned char *mac,
+                              unsigned long long clen,
+                              const unsigned char *n,
+                              const unsigned char *pk,
+                              const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
-#define crypto_box_BEFORENMBYTES 
crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_BEFORENMBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
 SODIUM_EXPORT
-size_t  crypto_box_beforenmbytes(void);
+size_t  crypto_box_beforenmbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_beforenm (unsigned char *k, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_box_easy_afternm (unsigned char *c, const unsigned char *m,
+                             unsigned long long mlen, const unsigned char *n,
+                             const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                             4,
+                                                                             
5)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
-                                 unsigned long long clen, const unsigned char 
*n,
-                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_easy_afternm (unsigned char *m, const unsigned char *c,
+                                  unsigned long long clen, const unsigned
+                                  char *n,
+                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
-                                const unsigned char *m, unsigned long long 
mlen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_detached_afternm (unsigned char *c, unsigned char *mac,
+                                 const unsigned char *m, unsigned long long
+                                 mlen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
-                                     const unsigned char *mac,
-                                     unsigned long long clen, const unsigned 
char *n,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_open_detached_afternm (unsigned char *m, const unsigned char *c,
+                                      const unsigned char *mac,
+                                      unsigned long long clen, const unsigned
+                                      char *n,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_SEALBYTES (crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_sealbytes(void);
+size_t crypto_box_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_seal(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_seal (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_seal_open (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_zerobytes(void);
+size_t  crypto_box_zerobytes (void);
 
-#define crypto_box_BOXZEROBYTES 
crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_BOXZEROBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_boxzerobytes(void);
+size_t  crypto_box_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box(unsigned char *c, const unsigned char *m,
-               unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box (unsigned char *c, const unsigned char *m,
+                unsigned long long mlen, const unsigned char *n,
+                const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open(unsigned char *m, const unsigned char *c,
-                    unsigned long long clen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open (unsigned char *m, const unsigned char *c,
+                     unsigned long long clen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_afternm(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen, const unsigned char *n,
-                       const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_box_afternm (unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                        5)));
 
 SODIUM_EXPORT
-int crypto_box_open_afternm(unsigned char *m, const unsigned char *c,
-                            unsigned long long clen, const unsigned char *n,
-                            const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_afternm (unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h
index 26a3d31..092da6d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_box_curve25519xchacha20poly1305_H
 #define crypto_box_curve25519xchacha20poly1305_H
 
@@ -15,147 +14,170 @@ extern "C" {
 
 #define crypto_box_curve25519xchacha20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_macbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max (void);
+
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+int crypto_box_curve25519xchacha20poly1305_seed_keypair (unsigned char *pk,
+                                                         unsigned char *sk,
+                                                         const unsigned
+                                                         char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
-                                                        unsigned char *sk,
-                                                        const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_keypair (unsigned char *pk,
+                                                    unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk,
-                                                   unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_easy (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *pk,
+                                                 const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *pk,
-                                                const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_open_easy (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
+int crypto_box_curve25519xchacha20poly1305_detached (unsigned char *c,
+                                                     unsigned char *mac,
+                                                     const unsigned char *m,
+                                                     unsigned long long mlen,
                                                      const unsigned char *n,
                                                      const unsigned char *pk,
                                                      const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c,
-                                                    unsigned char *mac,
-                                                    const unsigned char *m,
-                                                    unsigned long long mlen,
-                                                    const unsigned char *n,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m,
-                                                         const unsigned char 
*c,
-                                                         const unsigned char 
*mac,
-                                                         unsigned long long 
clen,
-                                                         const unsigned char 
*n,
-                                                         const unsigned char 
*pk,
-                                                         const unsigned char 
*sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached (unsigned char *m,
+                                                          const unsigned
+                                                          char *c,
+                                                          const unsigned
+                                                          char *mac,
+                                                          unsigned long long
+                                                          clen,
+                                                          const unsigned
+                                                          char *n,
+                                                          const unsigned
+                                                          char *pk,
+                                                          const unsigned
+                                                          char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char *n,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m,
-                                                             const unsigned 
char *c,
-                                                             unsigned long 
long clen,
-                                                             const unsigned 
char *n,
-                                                             const unsigned 
char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c,
-                                                            unsigned char *mac,
-                                                            const unsigned 
char *m,
-                                                            unsigned long long 
mlen,
-                                                            const unsigned 
char *n,
-                                                            const unsigned 
char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_curve25519xchacha20poly1305_beforenm (unsigned char *k,
+                                                     const unsigned char *pk,
+                                                     const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char 
*m,
-                                                                 const 
unsigned char *c,
-                                                                 const 
unsigned char *mac,
-                                                                 unsigned long 
long clen,
-                                                                 const 
unsigned char *n,
-                                                                 const 
unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_easy_afternm (unsigned char *c,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned char 
*n,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_easy_afternm (unsigned char *m,
+                                                              const unsigned
+                                                              char *c,
+                                                              unsigned long 
long
+                                                              clen,
+                                                              const unsigned
+                                                              char *n,
+                                                              const unsigned
+                                                              char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_detached_afternm (unsigned char *c,
+                                                             unsigned char 
*mac,
+                                                             const unsigned
+                                                             char *m,
+                                                             unsigned long long
+                                                             mlen,
+                                                             const unsigned
+                                                             char *n,
+                                                             const unsigned
+                                                             char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached_afternm (unsigned
+                                                                  char *m,
+                                                                  const 
unsigned
+                                                                  char *c,
+                                                                  const 
unsigned
+                                                                  char *mac,
+                                                                  unsigned long
+                                                                  long clen,
+                                                                  const 
unsigned
+                                                                  char *n,
+                                                                  const 
unsigned
+                                                                  char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_curve25519xchacha20poly1305_SEALBYTES \
-    (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES + \
-     crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES   \
+   + crypto_box_curve25519xchacha20poly1305_MACBYTES)
 
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_sealbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_curve25519xchacha20poly1305_seal (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal_open(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
-                                                     const unsigned char *pk,
-                                                     const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xchacha20poly1305_seal_open (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index e733f49..32e6b32 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -14,96 +14,98 @@ extern "C" {
 
 #define crypto_box_curve25519xsalsa20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair (unsigned char *pk,
+                                                        unsigned char *sk,
+                                                        const unsigned
+                                                        char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_keypair (unsigned char *pk,
+                                                   unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_beforenm (unsigned char *k,
+                                                    const unsigned char *pk,
+                                                    const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \
-    (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_zerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *n,
-                                          const unsigned char *pk,
-                                          const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305 (unsigned char *c,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *n,
+                                           const unsigned char *pk,
+                                           const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *n,
-                                               const unsigned char *pk,
-                                               const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305_open (unsigned char *m,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *n,
+                                                const unsigned char *pk,
+                                                const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *n,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_box_curve25519xsalsa20poly1305_afternm (unsigned char *c,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *n,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char *n,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xsalsa20poly1305_open_afternm (unsigned char *m,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned char *n,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ed25519.h
index dcc46a6..78800dc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ed25519.h
@@ -10,88 +10,92 @@ extern "C" {
 
 #define crypto_core_ed25519_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_bytes(void);
+size_t crypto_core_ed25519_bytes (void);
 
 #define crypto_core_ed25519_UNIFORMBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_uniformbytes(void);
+size_t crypto_core_ed25519_uniformbytes (void);
 
 #define crypto_core_ed25519_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_hashbytes(void);
+size_t crypto_core_ed25519_hashbytes (void);
 
 #define crypto_core_ed25519_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_scalarbytes(void);
+size_t crypto_core_ed25519_scalarbytes (void);
 
 #define crypto_core_ed25519_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_nonreducedscalarbytes(void);
+size_t crypto_core_ed25519_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ed25519_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_add(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_add (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_sub(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_sub (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_from_uniform (unsigned char *p, const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h)
-            __attribute__ ((nonnull)) __attribute__ ((deprecated));
+int crypto_core_ed25519_from_hash (unsigned char *p, const unsigned char *h)
+__attribute__ ((nonnull)) __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_scalar_invert(unsigned char *recip, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_scalar_invert (unsigned char *recip, const unsigned
+                                       char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_negate(unsigned char *neg, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_negate (unsigned char *neg, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_complement(unsigned char *comp, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_complement (unsigned char *comp, const unsigned
+                                            char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_add(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_add (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_sub(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_sub (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_mul(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_mul (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_reduce(unsigned char *r, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_reduce (unsigned char *r, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hchacha20.h
index ece141b..692f833 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hchacha20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hchacha20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_outputbytes(void);
+size_t crypto_core_hchacha20_outputbytes (void);
 
 #define crypto_core_hchacha20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_inputbytes(void);
+size_t crypto_core_hchacha20_inputbytes (void);
 
 #define crypto_core_hchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_keybytes(void);
+size_t crypto_core_hchacha20_keybytes (void);
 
 #define crypto_core_hchacha20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_constbytes(void);
+size_t crypto_core_hchacha20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hchacha20 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hsalsa20.h
index 4bf7a48..67ecdab 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_hsalsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_outputbytes(void);
+size_t crypto_core_hsalsa20_outputbytes (void);
 
 #define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_inputbytes(void);
+size_t crypto_core_hsalsa20_inputbytes (void);
 
 #define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_keybytes(void);
+size_t crypto_core_hsalsa20_keybytes (void);
 
 #define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_constbytes(void);
+size_t crypto_core_hsalsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hsalsa20 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ristretto255.h
index f2820e5..053957a 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_ristretto255.h
@@ -10,88 +10,90 @@ extern "C" {
 
 #define crypto_core_ristretto255_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_bytes(void);
+size_t crypto_core_ristretto255_bytes (void);
 
 #define crypto_core_ristretto255_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_hashbytes(void);
+size_t crypto_core_ristretto255_hashbytes (void);
 
 #define crypto_core_ristretto255_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_scalarbytes(void);
+size_t crypto_core_ristretto255_scalarbytes (void);
 
 #define crypto_core_ristretto255_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_nonreducedscalarbytes(void);
+size_t crypto_core_ristretto255_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_add(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_add (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_sub(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_sub (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_from_hash(unsigned char *p,
-                                       const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_from_hash (unsigned char *p,
+                                        const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_scalar_invert(unsigned char *recip,
-                                           const unsigned char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_scalar_invert (unsigned char *recip,
+                                            const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_negate(unsigned char *neg,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_negate (unsigned char *neg,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_complement(unsigned char *comp,
-                                                const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_complement (unsigned char *comp,
+                                                 const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_add(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_add (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_sub(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_sub (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_mul(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_mul (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_reduce(unsigned char *r,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_reduce (unsigned char *r,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa20.h
index bd79fd9..ffea366 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_outputbytes(void);
+size_t crypto_core_salsa20_outputbytes (void);
 
 #define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_inputbytes(void);
+size_t crypto_core_salsa20_inputbytes (void);
 
 #define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_keybytes(void);
+size_t crypto_core_salsa20_keybytes (void);
 
 #define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_constbytes(void);
+size_t crypto_core_salsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
-                        const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa20 (unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa2012.h
index 0595759..70740ac 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa2012.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_outputbytes(void);
+size_t crypto_core_salsa2012_outputbytes (void);
 
 #define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_inputbytes(void);
+size_t crypto_core_salsa2012_inputbytes (void);
 
 #define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_keybytes(void);
+size_t crypto_core_salsa2012_keybytes (void);
 
 #define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_constbytes(void);
+size_t crypto_core_salsa2012_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa2012 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa208.h
index d2f216a..fb91b43 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_core_salsa208.h
@@ -10,28 +10,28 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_outputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_inputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_constbytes (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa208 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash.h
index d897e5d..afe7a1e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash.h
@@ -15,31 +15,31 @@ extern "C" {
 
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_min(void);
+size_t  crypto_generichash_bytes_min (void);
 
 #define crypto_generichash_BYTES_MAX crypto_generichash_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_max(void);
+size_t  crypto_generichash_bytes_max (void);
 
 #define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
+size_t  crypto_generichash_bytes (void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_min(void);
+size_t  crypto_generichash_keybytes_min (void);
 
 #define crypto_generichash_KEYBYTES_MAX crypto_generichash_blake2b_KEYBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_max(void);
+size_t  crypto_generichash_keybytes_max (void);
 
 #define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_keybytes (void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_generichash_primitive(void);
+const char *crypto_generichash_primitive (void);
 
 /*
  * Important when writing bindings for other programming languages:
@@ -48,34 +48,34 @@ const char *crypto_generichash_primitive(void);
 typedef crypto_generichash_blake2b_state crypto_generichash_state;
 
 SODIUM_EXPORT
-size_t  crypto_generichash_statebytes(void);
+size_t  crypto_generichash_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash(unsigned char *out, size_t outlen,
-                       const unsigned char *in, unsigned long long inlen,
-                       const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash (unsigned char *out, size_t outlen,
+                        const unsigned char *in, unsigned long long inlen,
+                        const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_init(crypto_generichash_state *state,
-                            const unsigned char *key,
-                            const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_init (crypto_generichash_state *state,
+                             const unsigned char *key,
+                             const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_update(crypto_generichash_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_update (crypto_generichash_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_final(crypto_generichash_state *state,
-                             unsigned char *out, const size_t outlen)
-            __attribute__ ((nonnull));
+int crypto_generichash_final (crypto_generichash_state *state,
+                              unsigned char *out, const size_t outlen)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_keygen (unsigned char k[crypto_generichash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash_blake2b.h
index ae3b52f..e0e4462 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_generichash_blake2b.h
@@ -22,8 +22,9 @@ extern "C" {
 # pragma pack(push, 1)
 #endif
 
-typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state {
-    unsigned char opaque[384];
+typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state
+{
+  unsigned char opaque[384];
 } crypto_generichash_blake2b_state;
 
 #ifdef __IBMC__
@@ -36,84 +37,89 @@ typedef struct CRYPTO_ALIGN(64) 
crypto_generichash_blake2b_state {
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_min(void);
+size_t crypto_generichash_blake2b_bytes_min (void);
 
 #define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_max(void);
+size_t crypto_generichash_blake2b_bytes_max (void);
 
 #define crypto_generichash_blake2b_BYTES         32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes(void);
+size_t crypto_generichash_blake2b_bytes (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_min(void);
+size_t crypto_generichash_blake2b_keybytes_min (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_max(void);
+size_t crypto_generichash_blake2b_keybytes_max (void);
 
 #define crypto_generichash_blake2b_KEYBYTES      32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes(void);
+size_t crypto_generichash_blake2b_keybytes (void);
 
 #define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_saltbytes(void);
+size_t crypto_generichash_blake2b_saltbytes (void);
 
 #define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_personalbytes(void);
+size_t crypto_generichash_blake2b_personalbytes (void);
 
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_statebytes(void);
+size_t crypto_generichash_blake2b_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
-                               const unsigned char *in,
-                               unsigned long long inlen,
-                               const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b (unsigned char *out, size_t outlen,
+                                const unsigned char *in,
+                                unsigned long long inlen,
+                                const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
-                                             const unsigned char *in,
-                                             unsigned long long inlen,
-                                             const unsigned char *key,
-                                             size_t keylen,
-                                             const unsigned char *salt,
-                                             const unsigned char *personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_salt_personal (unsigned char *out, size_t 
outlen,
+                                              const unsigned char *in,
+                                              unsigned long long inlen,
+                                              const unsigned char *key,
+                                              size_t keylen,
+                                              const unsigned char *salt,
+                                              const unsigned char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
-                                    const unsigned char *key,
-                                    const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init (crypto_generichash_blake2b_state *state,
+                                     const unsigned char *key,
+                                     const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int 
crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state 
*state,
-                                                  const unsigned char *key,
-                                                  const size_t keylen, const 
size_t outlen,
-                                                  const unsigned char *salt,
-                                                  const unsigned char 
*personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init_salt_personal (
+  crypto_generichash_blake2b_state *state,
+  const unsigned char *key,
+  const size_t keylen, const
+  size_t outlen,
+  const unsigned char *salt,
+  const unsigned
+  char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
-                                      const unsigned char *in,
-                                      unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_update (crypto_generichash_blake2b_state *state,
+                                       const unsigned char *in,
+                                       unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
-                                     unsigned char *out,
-                                     const size_t outlen) __attribute__ 
((nonnull));
+int crypto_generichash_blake2b_final (crypto_generichash_blake2b_state *state,
+                                      unsigned char *out,
+                                      const size_t outlen) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_blake2b_keygen(unsigned char 
k[crypto_generichash_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_blake2b_keygen (unsigned char
+                                        k[crypto_generichash_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash.h
index 767d548..a0ac1fe 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash.h
@@ -22,16 +22,16 @@ extern "C" {
 
 #define crypto_hash_BYTES crypto_hash_sha512_BYTES
 SODIUM_EXPORT
-size_t crypto_hash_bytes(void);
+size_t crypto_hash_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 #define crypto_hash_PRIMITIVE "sha512"
 SODIUM_EXPORT
-const char *crypto_hash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_hash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha256.h
index c47982a..2adabae 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha256.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha256_state {
-    uint32_t state[8];
-    uint64_t count;
-    uint8_t  buf[64];
+typedef struct crypto_hash_sha256_state
+{
+  uint32_t state[8];
+  uint64_t count;
+  uint8_t buf[64];
 } crypto_hash_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha256_statebytes(void);
+size_t crypto_hash_sha256_statebytes (void);
 
 #define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_hash_sha256_bytes(void);
+size_t crypto_hash_sha256_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha256 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_init(crypto_hash_sha256_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_init (crypto_hash_sha256_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha256_update (crypto_hash_sha256_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_final (crypto_hash_sha256_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha512.h
index 5b690fb..b9618a7 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_hash_sha512.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha512_state {
-    uint64_t state[8];
-    uint64_t count[2];
-    uint8_t  buf[128];
+typedef struct crypto_hash_sha512_state
+{
+  uint64_t state[8];
+  uint64_t count[2];
+  uint8_t buf[128];
 } crypto_hash_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha512_statebytes(void);
+size_t crypto_hash_sha512_statebytes (void);
 
 #define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_hash_sha512_bytes(void);
+size_t crypto_hash_sha512_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha512 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_init(crypto_hash_sha512_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_init (crypto_hash_sha512_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha512_update (crypto_hash_sha512_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_final (crypto_hash_sha512_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf.h
index ac2fc61..f083146 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf.h
@@ -16,35 +16,35 @@ extern "C" {
 
 #define crypto_kdf_BYTES_MIN crypto_kdf_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_min(void);
+size_t crypto_kdf_bytes_min (void);
 
 #define crypto_kdf_BYTES_MAX crypto_kdf_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_max(void);
+size_t crypto_kdf_bytes_max (void);
 
 #define crypto_kdf_CONTEXTBYTES crypto_kdf_blake2b_CONTEXTBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_contextbytes(void);
+size_t crypto_kdf_contextbytes (void);
 
 #define crypto_kdf_KEYBYTES crypto_kdf_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_keybytes(void);
+size_t crypto_kdf_keybytes (void);
 
 #define crypto_kdf_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_kdf_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_kdf_primitive (void)
+__attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int crypto_kdf_derive_from_key(unsigned char *subkey, size_t subkey_len,
-                               uint64_t subkey_id,
-                               const char ctx[crypto_kdf_CONTEXTBYTES],
-                               const unsigned char key[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_derive_from_key (unsigned char *subkey, size_t subkey_len,
+                                uint64_t subkey_id,
+                                const char ctx[crypto_kdf_CONTEXTBYTES],
+                                const unsigned char key[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_kdf_keygen(unsigned char k[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_keygen (unsigned char k[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_blake2b.h
index 489c7c2..a2f287e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_blake2b.h
@@ -16,26 +16,29 @@ extern "C" {
 
 #define crypto_kdf_blake2b_BYTES_MIN 16
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_min(void);
+size_t crypto_kdf_blake2b_bytes_min (void);
 
 #define crypto_kdf_blake2b_BYTES_MAX 64
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_max(void);
+size_t crypto_kdf_blake2b_bytes_max (void);
 
 #define crypto_kdf_blake2b_CONTEXTBYTES 8
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_contextbytes(void);
+size_t crypto_kdf_blake2b_contextbytes (void);
 
 #define crypto_kdf_blake2b_KEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_keybytes(void);
+size_t crypto_kdf_blake2b_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_blake2b_derive_from_key(unsigned char *subkey, size_t 
subkey_len,
-                                       uint64_t subkey_id,
-                                       const char 
ctx[crypto_kdf_blake2b_CONTEXTBYTES],
-                                       const unsigned char 
key[crypto_kdf_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_blake2b_derive_from_key (unsigned char *subkey, size_t
+                                        subkey_len,
+                                        uint64_t subkey_id,
+                                        const char
+                                        ctx[crypto_kdf_blake2b_CONTEXTBYTES],
+                                        const unsigned char
+                                        key[crypto_kdf_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha256.h
index e7e7f4d..39ba301 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha256.h
@@ -18,54 +18,61 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha256_KEYBYTES crypto_auth_hmacsha256_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_keybytes(void);
+size_t crypto_kdf_hkdf_sha256_keybytes (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_min(void);
+size_t crypto_kdf_hkdf_sha256_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MAX (0xff * crypto_auth_hmacsha256_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_max(void);
+size_t crypto_kdf_hkdf_sha256_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(4)));
+int crypto_kdf_hkdf_sha256_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(4)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha256_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
+void crypto_kdf_hkdf_sha256_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha256_state {
-    crypto_auth_hmacsha256_state st;
+typedef struct crypto_kdf_hkdf_sha256_state
+{
+  crypto_auth_hmacsha256_state st;
 } crypto_kdf_hkdf_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_statebytes(void);
+size_t crypto_kdf_hkdf_sha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_init(crypto_kdf_hkdf_sha256_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_extract_init (crypto_kdf_hkdf_sha256_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_update(crypto_kdf_hkdf_sha256_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_update (crypto_kdf_hkdf_sha256_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_final(crypto_kdf_hkdf_sha256_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_final (crypto_kdf_hkdf_sha256_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha512.h
index 0ed205d..bfcabdb 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kdf_hkdf_sha512.h
@@ -18,55 +18,62 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha512_KEYBYTES crypto_auth_hmacsha512_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_keybytes(void);
+size_t crypto_kdf_hkdf_sha512_keybytes (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_min(void);
+size_t crypto_kdf_hkdf_sha512_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MAX (0xff * crypto_auth_hmacsha512_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_max(void);
+size_t crypto_kdf_hkdf_sha512_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha512_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_hkdf_sha512_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha512_state {
-    crypto_auth_hmacsha512_state st;
+typedef struct crypto_kdf_hkdf_sha512_state
+{
+  crypto_auth_hmacsha512_state st;
 } crypto_kdf_hkdf_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_statebytes(void);
+size_t crypto_kdf_hkdf_sha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_init(crypto_kdf_hkdf_sha512_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract_init (crypto_kdf_hkdf_sha512_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_update(crypto_kdf_hkdf_sha512_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_update (crypto_kdf_hkdf_sha512_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_final(crypto_kdf_hkdf_sha512_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_final (crypto_kdf_hkdf_sha512_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kx.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kx.h
index 347132c..2227064 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kx.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_kx.h
@@ -14,50 +14,56 @@ extern "C" {
 
 #define crypto_kx_PUBLICKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_publickeybytes(void);
+size_t crypto_kx_publickeybytes (void);
 
 #define crypto_kx_SECRETKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_secretkeybytes(void);
+size_t crypto_kx_secretkeybytes (void);
 
 #define crypto_kx_SEEDBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_seedbytes(void);
+size_t crypto_kx_seedbytes (void);
 
 #define crypto_kx_SESSIONKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_sessionkeybytes(void);
+size_t crypto_kx_sessionkeybytes (void);
 
 #define crypto_kx_PRIMITIVE "x25519blake2b"
 SODIUM_EXPORT
-const char *crypto_kx_primitive(void);
+const char *crypto_kx_primitive (void);
 
 SODIUM_EXPORT
-int crypto_kx_seed_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                           unsigned char sk[crypto_kx_SECRETKEYBYTES],
-                           const unsigned char seed[crypto_kx_SEEDBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_seed_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                            unsigned char sk[crypto_kx_SECRETKEYBYTES],
+                            const unsigned char seed[crypto_kx_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                      unsigned char sk[crypto_kx_SECRETKEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                       unsigned char sk[crypto_kx_SECRETKEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_client_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
client_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_client_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   client_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_kx_server_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
server_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_server_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   server_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth.h
index 7cd7b07..25ada13 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth.h
@@ -16,47 +16,48 @@ extern "C" {
 typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
 
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_statebytes(void);
+size_t  crypto_onetimeauth_statebytes (void);
 
 #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_bytes(void);
+size_t  crypto_onetimeauth_bytes (void);
 
 #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_keybytes(void);
+size_t  crypto_onetimeauth_keybytes (void);
 
 #define crypto_onetimeauth_PRIMITIVE "poly1305"
 SODIUM_EXPORT
-const char *crypto_onetimeauth_primitive(void);
+const char *crypto_onetimeauth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_verify(const unsigned char *h, const unsigned char *in,
-                              unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_verify (const unsigned char *h, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_init(crypto_onetimeauth_state *state,
-                            const unsigned char *key) __attribute__ 
((nonnull));
+int crypto_onetimeauth_init (crypto_onetimeauth_state *state,
+                             const unsigned char *key) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_update(crypto_onetimeauth_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_update (crypto_onetimeauth_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_final(crypto_onetimeauth_state *state,
-                             unsigned char *out) __attribute__ ((nonnull));
+int crypto_onetimeauth_final (crypto_onetimeauth_state *state,
+                              unsigned char *out) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_keygen (unsigned char k[crypto_onetimeauth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
index 1565d37..027107c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_onetimeauth_poly1305.h
@@ -16,54 +16,57 @@
 extern "C" {
 #endif
 
-typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state {
-    unsigned char opaque[256];
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+  unsigned char opaque[256];
 } crypto_onetimeauth_poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_statebytes(void);
+size_t crypto_onetimeauth_poly1305_statebytes (void);
 
 #define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_bytes(void);
+size_t crypto_onetimeauth_poly1305_bytes (void);
 
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_keybytes(void);
+size_t crypto_onetimeauth_poly1305_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305(unsigned char *out,
-                                const unsigned char *in,
-                                unsigned long long inlen,
-                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth_poly1305 (unsigned char *out,
+                                 const unsigned char *in,
+                                 unsigned long long inlen,
+                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_verify(const unsigned char *h,
-                                       const unsigned char *in,
-                                       unsigned long long inlen,
-                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_poly1305_verify (const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long inlen,
+                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
-                                     const unsigned char *key)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_init (crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state 
*state,
-                                       const unsigned char *in,
-                                       unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_poly1305_update (
+  crypto_onetimeauth_poly1305_state *state,
+  const unsigned char *in,
+  unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
-                                      unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_final (crypto_onetimeauth_poly1305_state 
*state,
+                                       unsigned char *out)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_poly1305_keygen(unsigned char 
k[crypto_onetimeauth_poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_poly1305_keygen (unsigned char
+                                         
k[crypto_onetimeauth_poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash.h
index 9683192..7e0ee9c 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash.h
@@ -16,83 +16,87 @@ extern "C" {
 
 #define crypto_pwhash_ALG_ARGON2I13 crypto_pwhash_argon2i_ALG_ARGON2I13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2i13(void);
+int crypto_pwhash_alg_argon2i13 (void);
 
 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2id13(void);
+int crypto_pwhash_alg_argon2id13 (void);
 
 #define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_default(void);
+int crypto_pwhash_alg_default (void);
 
 #define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_min(void);
+size_t crypto_pwhash_bytes_min (void);
 
 #define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_max(void);
+size_t crypto_pwhash_bytes_max (void);
 
 #define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_min(void);
+size_t crypto_pwhash_passwd_min (void);
 
 #define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_max(void);
+size_t crypto_pwhash_passwd_max (void);
 
 #define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_saltbytes(void);
+size_t crypto_pwhash_saltbytes (void);
 
 #define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_strbytes(void);
+size_t crypto_pwhash_strbytes (void);
 
 #define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
-const char *crypto_pwhash_strprefix(void);
+const char *crypto_pwhash_strprefix (void);
 
 #define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_min(void);
+size_t crypto_pwhash_opslimit_min (void);
 
 #define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_max(void);
+size_t crypto_pwhash_opslimit_max (void);
 
 #define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_min(void);
+size_t crypto_pwhash_memlimit_min (void);
 
 #define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_max(void);
+size_t crypto_pwhash_memlimit_max (void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_interactive(void);
+size_t crypto_pwhash_opslimit_interactive (void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_interactive(void);
+size_t crypto_pwhash_memlimit_interactive (void);
 
 #define crypto_pwhash_OPSLIMIT_MODERATE 
crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_moderate(void);
+size_t crypto_pwhash_opslimit_moderate (void);
 
 #define crypto_pwhash_MEMLIMIT_MODERATE 
crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_moderate(void);
+size_t crypto_pwhash_memlimit_moderate (void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE 
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_sensitive(void);
+size_t crypto_pwhash_opslimit_sensitive (void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE 
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_sensitive(void);
+size_t crypto_pwhash_memlimit_sensitive (void);
 
 /*
  * With this function, do not forget to store all parameters, including the
@@ -101,11 +105,11 @@ size_t crypto_pwhash_memlimit_sensitive(void);
  * may change.
  */
 SODIUM_EXPORT
-int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
-                  const char * const passwd, unsigned long long passwdlen,
-                  const unsigned char * const salt,
-                  unsigned long long opslimit, size_t memlimit, int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash (unsigned char *const out, unsigned long long outlen,
+                   const char *const passwd, unsigned long long passwdlen,
+                   const unsigned char *const salt,
+                   unsigned long long opslimit, size_t memlimit, int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /*
  * The output string already includes all the required parameters, including
@@ -113,32 +117,35 @@ int crypto_pwhash(unsigned char * const out, unsigned 
long long outlen,
  * order to verify a password.
  */
 SODIUM_EXPORT
-int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
-                      const char * const passwd, unsigned long long passwdlen,
-                      unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str (char out[crypto_pwhash_STRBYTES],
+                       const char *const passwd, unsigned long long passwdlen,
+                       unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
-                          const char * const passwd, unsigned long long 
passwdlen,
-                          unsigned long long opslimit, size_t memlimit, int 
alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_alg (char out[crypto_pwhash_STRBYTES],
+                           const char *const passwd, unsigned long long
+                           passwdlen,
+                           unsigned long long opslimit, size_t memlimit, int
+                           alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_verify(const char *str,
-                             const char * const passwd,
-                             unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_verify (const char *str,
+                              const char *const passwd,
+                              unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_needs_rehash(const char *str,
-                                   unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_needs_rehash (const char *str,
+                                    unsigned long long opslimit, size_t
+                                    memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
-const char *crypto_pwhash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_pwhash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2i.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2i.h
index 63abdf4..65b2bc4 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2i.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2i.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2i_ALG_ARGON2I13 1
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_alg_argon2i13(void);
+int crypto_pwhash_argon2i_alg_argon2i13 (void);
 
 #define crypto_pwhash_argon2i_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_min(void);
+size_t crypto_pwhash_argon2i_bytes_min (void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                    4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_max(void);
+size_t crypto_pwhash_argon2i_bytes_max (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_min(void);
+size_t crypto_pwhash_argon2i_passwd_min (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_max(void);
+size_t crypto_pwhash_argon2i_passwd_max (void);
 
 #define crypto_pwhash_argon2i_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_saltbytes(void);
+size_t crypto_pwhash_argon2i_saltbytes (void);
 
 #define crypto_pwhash_argon2i_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_strbytes(void);
+size_t crypto_pwhash_argon2i_strbytes (void);
 
 #define crypto_pwhash_argon2i_STRPREFIX "$argon2i$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2i_strprefix(void);
+const char *crypto_pwhash_argon2i_strprefix (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MIN 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_min(void);
+size_t crypto_pwhash_argon2i_opslimit_min (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_max(void);
+size_t crypto_pwhash_argon2i_opslimit_max (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_min(void);
+size_t crypto_pwhash_argon2i_memlimit_min (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_max(void);
+size_t crypto_pwhash_argon2i_memlimit_max (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_interactive(void);
+size_t crypto_pwhash_argon2i_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_interactive(void);
+size_t crypto_pwhash_argon2i_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MODERATE 6U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_moderate(void);
+size_t crypto_pwhash_argon2i_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MODERATE 134217728U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_moderate(void);
+size_t crypto_pwhash_argon2i_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE 8U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2i_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE 536870912U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2i_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i(unsigned char * const out,
-                          unsigned long long outlen,
-                          const char * const passwd,
-                          unsigned long long passwdlen,
-                          const unsigned char * const salt,
-                          unsigned long long opslimit, size_t memlimit,
-                          int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i (unsigned char *const out,
+                           unsigned long long outlen,
+                           const char *const passwd,
+                           unsigned long long passwdlen,
+                           const unsigned char *const salt,
+                           unsigned long long opslimit, size_t memlimit,
+                           int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str(char out[crypto_pwhash_argon2i_STRBYTES],
-                              const char * const passwd,
-                              unsigned long long passwdlen,
-                              unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str (char out[crypto_pwhash_argon2i_STRBYTES],
+                               const char *const passwd,
+                               unsigned long long passwdlen,
+                               unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_verify(const char * str,
-                                     const char * const passwd,
-                                     unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_verify (const char *str,
+                                      const char *const passwd,
+                                      unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_needs_rehash(const char * str,
-                                           unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_needs_rehash (const char *str,
+                                            unsigned long long opslimit, size_t
+                                            memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2id.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2id.h
index 98bc83e..6a2194f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2id.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_argon2id.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_alg_argon2id13(void);
+int crypto_pwhash_argon2id_alg_argon2id13 (void);
 
 #define crypto_pwhash_argon2id_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_min(void);
+size_t crypto_pwhash_argon2id_bytes_min (void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                     4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_max(void);
+size_t crypto_pwhash_argon2id_bytes_max (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_min(void);
+size_t crypto_pwhash_argon2id_passwd_min (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_max(void);
+size_t crypto_pwhash_argon2id_passwd_max (void);
 
 #define crypto_pwhash_argon2id_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_saltbytes(void);
+size_t crypto_pwhash_argon2id_saltbytes (void);
 
 #define crypto_pwhash_argon2id_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_strbytes(void);
+size_t crypto_pwhash_argon2id_strbytes (void);
 
 #define crypto_pwhash_argon2id_STRPREFIX "$argon2id$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2id_strprefix(void);
+const char *crypto_pwhash_argon2id_strprefix (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MIN 1U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_min(void);
+size_t crypto_pwhash_argon2id_opslimit_min (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_max(void);
+size_t crypto_pwhash_argon2id_opslimit_max (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_min(void);
+size_t crypto_pwhash_argon2id_memlimit_min (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_max(void);
+size_t crypto_pwhash_argon2id_memlimit_max (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE 2U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_interactive(void);
+size_t crypto_pwhash_argon2id_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE 67108864U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_interactive(void);
+size_t crypto_pwhash_argon2id_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MODERATE 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_moderate(void);
+size_t crypto_pwhash_argon2id_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MODERATE 268435456U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_moderate(void);
+size_t crypto_pwhash_argon2id_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2id_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2id_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id(unsigned char * const out,
-                           unsigned long long outlen,
-                           const char * const passwd,
-                           unsigned long long passwdlen,
-                           const unsigned char * const salt,
-                           unsigned long long opslimit, size_t memlimit,
-                           int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id (unsigned char *const out,
+                            unsigned long long outlen,
+                            const char *const passwd,
+                            unsigned long long passwdlen,
+                            const unsigned char *const salt,
+                            unsigned long long opslimit, size_t memlimit,
+                            int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str(char out[crypto_pwhash_argon2id_STRBYTES],
-                               const char * const passwd,
-                               unsigned long long passwdlen,
-                               unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str (char out[crypto_pwhash_argon2id_STRBYTES],
+                                const char *const passwd,
+                                unsigned long long passwdlen,
+                                unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_verify(const char * str,
-                                      const char * const passwd,
-                                      unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_verify (const char *str,
+                                       const char *const passwd,
+                                       unsigned long long passwdlen)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_needs_rehash(const char * str,
-                                            unsigned long long opslimit, 
size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_needs_rehash (const char *str,
+                                             unsigned long long opslimit, 
size_t
+                                             memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
index 8956dfb..ed33309 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
@@ -16,102 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
+  SODIUM_MIN (SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_saltbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_strbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$"
 SODIUM_EXPORT
-const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void);
+const char *crypto_pwhash_scryptsalsa208sha256_strprefix (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MIN 32768U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MIN 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
-    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
+  SODIUM_MIN (SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256(unsigned char * const out,
-                                       unsigned long long outlen,
-                                       const char * const passwd,
-                                       unsigned long long passwdlen,
-                                       const unsigned char * const salt,
-                                       unsigned long long opslimit,
-                                       size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256 (unsigned char *const out,
+                                        unsigned long long outlen,
+                                        const char *const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char *const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str(char 
out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
-                                           const char * const passwd,
-                                           unsigned long long passwdlen,
-                                           unsigned long long opslimit,
-                                           size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str (char
+                                            out[
+                                              
crypto_pwhash_scryptsalsa208sha256_STRBYTES
+                                            ],
+                                            const char *const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_verify(const char * str,
-                                                  const char * const passwd,
-                                                  unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_verify (const char *str,
+                                                   const char *const passwd,
+                                                   unsigned long long 
passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t 
passwdlen,
-                                          const uint8_t * salt, size_t saltlen,
-                                          uint64_t N, uint32_t r, uint32_t p,
-                                          uint8_t * buf, size_t buflen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_ll (const uint8_t *passwd, size_t
+                                           passwdlen,
+                                           const uint8_t *salt, size_t saltlen,
+                                           uint64_t N, uint32_t r, uint32_t p,
+                                           uint8_t *buf, size_t buflen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char * str,
-                                                        unsigned long long 
opslimit,
-                                                        size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash (const char *str,
+                                                         unsigned long long
+                                                         opslimit,
+                                                         size_t memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult.h
index 1c68585..15586d3 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult.h
@@ -12,19 +12,19 @@ extern "C" {
 
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_bytes(void);
+size_t  crypto_scalarmult_bytes (void);
 
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_scalarbytes(void);
+size_t  crypto_scalarmult_scalarbytes (void);
 
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 SODIUM_EXPORT
-const char *crypto_scalarmult_primitive(void);
+const char *crypto_scalarmult_primitive (void);
 
 SODIUM_EXPORT
-int crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -35,9 +35,9 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned 
char *n)
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult(unsigned char *q, const unsigned char *n,
-                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult (unsigned char *q, const unsigned char *n,
+                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_curve25519.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_curve25519.h
index 60e9d0c..9cde57c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_curve25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_curve25519.h
@@ -11,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_curve25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_bytes(void);
+size_t crypto_scalarmult_curve25519_bytes (void);
 
 #define crypto_scalarmult_curve25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_scalarbytes(void);
+size_t crypto_scalarmult_curve25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -26,14 +26,14 @@ size_t crypto_scalarmult_curve25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
-                                 const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519 (unsigned char *q, const unsigned char *n,
+                                  const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519_base(unsigned char *q,
-                                      const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519_base (unsigned char *q,
+                                       const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ed25519.h
index 2dfa4d7..749c0c1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ed25519.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ed25519_H
 #define crypto_scalarmult_ed25519_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ed25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_bytes(void);
+size_t crypto_scalarmult_ed25519_bytes (void);
 
 #define crypto_scalarmult_ed25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_scalarbytes(void);
+size_t crypto_scalarmult_ed25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,22 +26,23 @@ size_t crypto_scalarmult_ed25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519(unsigned char *q, const unsigned char *n,
-                              const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519 (unsigned char *q, const unsigned char *n,
+                               const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_noclamp(unsigned char *q, const unsigned char *n,
-                                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_noclamp (unsigned char *q, const unsigned char 
*n,
+                                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base_noclamp(unsigned char *q, const unsigned 
char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base_noclamp (unsigned char *q, const unsigned
+                                            char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ristretto255.h
index 40a45cc..b1840a1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_scalarmult_ristretto255.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ristretto255_H
 #define crypto_scalarmult_ristretto255_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ristretto255_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_bytes(void);
+size_t crypto_scalarmult_ristretto255_bytes (void);
 
 #define crypto_scalarmult_ristretto255_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_scalarbytes(void);
+size_t crypto_scalarmult_ristretto255_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,14 +26,14 @@ size_t crypto_scalarmult_ristretto255_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255(unsigned char *q, const unsigned char *n,
-                                   const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255 (unsigned char *q, const unsigned char *n,
+                                    const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255_base(unsigned char *q,
-                                        const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255_base (unsigned char *q,
+                                         const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox.h
index 1d3709d..c764617 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox.h
@@ -15,76 +15,80 @@ extern "C" {
 
 #define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_keybytes(void);
+size_t  crypto_secretbox_keybytes (void);
 
 #define crypto_secretbox_NONCEBYTES 
crypto_secretbox_xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_noncebytes(void);
+size_t  crypto_secretbox_noncebytes (void);
 
 #define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_macbytes(void);
+size_t  crypto_secretbox_macbytes (void);
 
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_secretbox_primitive(void);
+const char *crypto_secretbox_primitive (void);
 
-#define crypto_secretbox_MESSAGEBYTES_MAX 
crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_secretbox_MESSAGEBYTES_MAX \
+  crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t crypto_secretbox_messagebytes_max(void);
+size_t crypto_secretbox_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
-                          unsigned long long mlen, const unsigned char *n,
-                          const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_secretbox_easy (unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k) __attribute__ ((nonnull(1, 
4,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
-                               unsigned long long clen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open_easy (unsigned char *m, const unsigned char *c,
+                                unsigned long long clen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
-                              const unsigned char *m,
-                              unsigned long long mlen,
-                              const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_detached (unsigned char *c, unsigned char *mac,
+                               const unsigned char *m,
+                               unsigned long long mlen,
+                               const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_detached(unsigned char *m,
-                                   const unsigned char *c,
-                                   const unsigned char *mac,
-                                   unsigned long long clen,
-                                   const unsigned char *n,
-                                   const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_open_detached (unsigned char *m,
+                                    const unsigned char *c,
+                                    const unsigned char *mac,
+                                    unsigned long long clen,
+                                    const unsigned char *n,
+                                    const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 SODIUM_EXPORT
-void crypto_secretbox_keygen(unsigned char k[crypto_secretbox_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_keygen (unsigned char k[crypto_secretbox_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_zerobytes(void);
+size_t  crypto_secretbox_zerobytes (void);
 
-#define crypto_secretbox_BOXZEROBYTES 
crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+#define crypto_secretbox_BOXZEROBYTES \
+  crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_boxzerobytes(void);
+size_t  crypto_secretbox_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_secretbox(unsigned char *c, const unsigned char *m,
-                     unsigned long long mlen, const unsigned char *n,
-                     const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_secretbox (unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                      5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
-                          unsigned long long clen, const unsigned char *n,
-                          const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open (unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h
index 6ec674e..509fac9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h
@@ -14,54 +14,55 @@ extern "C" {
 
 #define crypto_secretbox_xchacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_keybytes(void);
+size_t crypto_secretbox_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
+size_t crypto_secretbox_xchacha20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
+size_t crypto_secretbox_xchacha20poly1305_macbytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_secretbox_xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xchacha20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
-                                            const unsigned char *m,
-                                            unsigned long long mlen,
-                                            const unsigned char *n,
-                                            const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xchacha20poly1305_easy (unsigned char *c,
+                                             const unsigned char *m,
+                                             unsigned long long mlen,
+                                             const unsigned char *n,
+                                             const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_easy(unsigned char *m,
-                                                 const unsigned char *c,
-                                                 unsigned long long clen,
-                                                 const unsigned char *n,
-                                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xchacha20poly1305_open_easy (unsigned char *m,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
-                                                unsigned char *mac,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_xchacha20poly1305_detached (unsigned char *c,
+                                                 unsigned char *mac,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     const unsigned char *mac,
-                                                     unsigned long long clen,
-                                                     const unsigned char *n,
-                                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_xchacha20poly1305_open_detached (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      const unsigned char *mac,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index be0874c..18c9bfc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -14,53 +14,57 @@ extern "C" {
 
 #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_keybytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
-                                      const unsigned char *m,
-                                      unsigned long long mlen,
-                                      const unsigned char *n,
-                                      const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xsalsa20poly1305 (unsigned char *c,
+                                       const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n,
+                                       const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
-                                           const unsigned char *c,
-                                           unsigned long long clen,
-                                           const unsigned char *n,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xsalsa20poly1305_open (unsigned char *m,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *n,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char 
k[crypto_secretbox_xsalsa20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_xsalsa20poly1305_keygen (unsigned char
+                                               k[
+                                                 
crypto_secretbox_xsalsa20poly1305_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretstream_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretstream_xchacha20poly1305.h
index b22e4e9..6b8b135 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretstream_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_secretstream_xchacha20poly1305.h
@@ -15,91 +15,100 @@ extern "C" {
 #endif
 
 #define crypto_secretstream_xchacha20poly1305_ABYTES \
-    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+size_t crypto_secretstream_xchacha20poly1305_abytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
-    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+size_t crypto_secretstream_xchacha20poly1305_headerbytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_KEYBYTES \
-    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+size_t crypto_secretstream_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, 
\
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
               (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
-    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
-     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+  (crypto_secretstream_xchacha20poly1305_TAG_PUSH   \
+   | crypto_secretstream_xchacha20poly1305_TAG_REKEY)
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final (void);
 
-typedef struct crypto_secretstream_xchacha20poly1305_state {
-    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
-    unsigned char _pad[8];
+typedef struct crypto_secretstream_xchacha20poly1305_state
+{
+  unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+  unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+  unsigned char _pad[8];
 } crypto_secretstream_xchacha20poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+size_t crypto_secretstream_xchacha20poly1305_statebytes (void);
 
 SODIUM_EXPORT
 void crypto_secretstream_xchacha20poly1305_keygen
-   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
 int crypto_secretstream_xchacha20poly1305_init_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (crypto_secretstream_xchacha20poly1305_state * state,
+  unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *c, unsigned long long *clen_p,
-    const unsigned char *m, unsigned long long mlen,
-    const unsigned char *ad, unsigned long long adlen, unsigned char tag)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_push (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *c, unsigned long
+  long *clen_p,
+  const unsigned char *m, unsigned
+  long long mlen,
+  const unsigned char *ad,
+  unsigned long long adlen, unsigned char tag)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_init_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    const unsigned char 
header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_secretstream_xchacha20poly1305_init_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  const unsigned char
+  header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char
+  k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
-    const unsigned char *c, unsigned long long clen,
-    const unsigned char *ad, unsigned long long adlen)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *m, unsigned long
+  long *mlen_p, unsigned char *tag_p,
+  const unsigned char *c, unsigned
+  long long clen,
+  const unsigned char *ad,
+  unsigned long long adlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_secretstream_xchacha20poly1305_rekey
-    (crypto_secretstream_xchacha20poly1305_state *state);
+void crypto_secretstream_xchacha20poly1305_rekey (
+  crypto_secretstream_xchacha20poly1305_state *state);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash.h
index fecaa88..399538d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash.h
@@ -15,24 +15,24 @@ extern "C" {
 
 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_bytes(void);
+size_t  crypto_shorthash_bytes (void);
 
 #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_keybytes(void);
+size_t  crypto_shorthash_keybytes (void);
 
 #define crypto_shorthash_PRIMITIVE "siphash24"
 SODIUM_EXPORT
-const char *crypto_shorthash_primitive(void);
+const char *crypto_shorthash_primitive (void);
 
 SODIUM_EXPORT
-int crypto_shorthash(unsigned char *out, const unsigned char *in,
-                     unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash (unsigned char *out, const unsigned char *in,
+                      unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_shorthash_keygen (unsigned char k[crypto_shorthash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash_siphash24.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash_siphash24.h
index 1e6f72a..f179919 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash_siphash24.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_shorthash_siphash24.h
@@ -15,32 +15,35 @@ extern "C" {
 
 #define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_bytes(void);
+size_t crypto_shorthash_siphash24_bytes (void);
 
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_keybytes(void);
+size_t crypto_shorthash_siphash24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
-                               unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphash24 (unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned
+                                char *k)
+__attribute__ ((nonnull(1, 4)));
 
 #ifndef SODIUM_LIBRARY_MINIMAL
 /* -- 128-bit output -- */
 
 #define crypto_shorthash_siphashx24_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_bytes(void);
+size_t crypto_shorthash_siphashx24_bytes (void);
 
 #define crypto_shorthash_siphashx24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_keybytes(void);
+size_t crypto_shorthash_siphashx24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphashx24(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphashx24 (unsigned char *out, const unsigned char *in,
+                                 unsigned long long inlen, const unsigned
+                                 char *k)
+__attribute__ ((nonnull(1, 4)));
+
 #endif
 
 #ifdef __cplusplus
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign.h
index f5fafb1..9879476 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign.h
@@ -23,82 +23,84 @@ extern "C" {
 typedef crypto_sign_ed25519ph_state crypto_sign_state;
 
 SODIUM_EXPORT
-size_t  crypto_sign_statebytes(void);
+size_t  crypto_sign_statebytes (void);
 
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_sign_bytes(void);
+size_t  crypto_sign_bytes (void);
 
 #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_seedbytes(void);
+size_t  crypto_sign_seedbytes (void);
 
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_publickeybytes(void);
+size_t  crypto_sign_publickeybytes (void);
 
 #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_secretkeybytes(void);
+size_t  crypto_sign_secretkeybytes (void);
 
 #define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_sign_messagebytes_max(void);
+size_t  crypto_sign_messagebytes_max (void);
 
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
-const char *crypto_sign_primitive(void);
+const char *crypto_sign_primitive (void);
 
 SODIUM_EXPORT
-int crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                             const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_seed_keypair (unsigned char *pk, unsigned char *sk,
+                              const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-                const unsigned char *m, unsigned long long mlen,
-                const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
+int crypto_sign (unsigned char *sm, unsigned long long *smlen_p,
+                 const unsigned char *m, unsigned long long mlen,
+                 const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                     const unsigned char *sm, unsigned long long smlen,
-                     const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+int crypto_sign_open (unsigned char *m, unsigned long long *mlen_p,
+                      const unsigned char *sm, unsigned long long smlen,
+                      const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                         const unsigned char *m, unsigned long long mlen,
-                         const unsigned char *sk) __attribute__ ((nonnull(1, 
5)));
+int crypto_sign_detached (unsigned char *sig, unsigned long long *siglen_p,
+                          const unsigned char *m, unsigned long long mlen,
+                          const unsigned char *sk) __attribute__ ((nonnull(1,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_sign_verify_detached(const unsigned char *sig,
-                                const unsigned char *m,
-                                unsigned long long mlen,
-                                const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_verify_detached (const unsigned char *sig,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_init(crypto_sign_state *state);
+int crypto_sign_init (crypto_sign_state *state);
 
 SODIUM_EXPORT
-int crypto_sign_update(crypto_sign_state *state,
-                       const unsigned char *m, unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_update (crypto_sign_state *state,
+                        const unsigned char *m, unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                             unsigned long long *siglen_p,
-                             const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_final_create (crypto_sign_state *state, unsigned char *sig,
+                              unsigned long long *siglen_p,
+                              const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_final_verify(crypto_sign_state *state, const unsigned char 
*sig,
-                             const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_final_verify (crypto_sign_state *state, const unsigned
+                              char *sig,
+                              const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_ed25519.h
index 0fdac42..ba08826 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_ed25519.h
@@ -12,110 +12,112 @@
 extern "C" {
 #endif
 
-typedef struct crypto_sign_ed25519ph_state {
-    crypto_hash_sha512_state hs;
+typedef struct crypto_sign_ed25519ph_state
+{
+  crypto_hash_sha512_state hs;
 } crypto_sign_ed25519ph_state;
 
 SODIUM_EXPORT
-size_t crypto_sign_ed25519ph_statebytes(void);
+size_t crypto_sign_ed25519ph_statebytes (void);
 
 #define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_bytes(void);
+size_t crypto_sign_ed25519_bytes (void);
 
 #define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_seedbytes(void);
+size_t crypto_sign_ed25519_seedbytes (void);
 
 #define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_publickeybytes(void);
+size_t crypto_sign_ed25519_publickeybytes (void);
 
 #define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_secretkeybytes(void);
+size_t crypto_sign_ed25519_secretkeybytes (void);
 
-#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - 
crypto_sign_ed25519_BYTES)
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                              - crypto_sign_ed25519_BYTES)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_messagebytes_max(void);
+size_t crypto_sign_ed25519_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *sk)
-            __attribute__ ((nonnull(1, 5)));
+int crypto_sign_ed25519 (unsigned char *sm, unsigned long long *smlen_p,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+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)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((nonnull(1, 5)));
+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)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_ed25519_verify_detached (const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                     const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_seed_keypair (unsigned char *pk, unsigned char *sk,
+                                      const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                         const unsigned char *ed25519_pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519_pk_to_curve25519 (unsigned char *curve25519_pk,
+                                          const unsigned char *ed25519_pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                         const unsigned char *ed25519_sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_curve25519 (unsigned char *curve25519_sk,
+                                          const unsigned char *ed25519_sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_seed(unsigned char *seed,
-                                   const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_seed (unsigned char *seed,
+                                    const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_pk (unsigned char *pk, const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_init (crypto_sign_ed25519ph_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                                 const unsigned char *m,
-                                 unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_ed25519ph_update (crypto_sign_ed25519ph_state *state,
+                                  const unsigned char *m,
+                                  unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                       unsigned char *sig,
-                                       unsigned long long *siglen_p,
-                                       const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_ed25519ph_final_create (crypto_sign_ed25519ph_state *state,
+                                        unsigned char *sig,
+                                        unsigned long long *siglen_p,
+                                        const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                       const unsigned char *sig,
-                                       const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_final_verify (crypto_sign_ed25519ph_state *state,
+                                        const unsigned char *sig,
+                                        const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
index eed158a..bcfba7b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -25,28 +25,30 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
-#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX 
- crypto_sign_edwards25519sha512batch_BYTES)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                                              - \
+                                                              
crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *sm,
-                                        unsigned long long *smlen_p,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
+int crypto_sign_edwards25519sha512batch (unsigned char *sm,
+                                         unsigned long long *smlen_p,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
+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)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                                unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_sign_edwards25519sha512batch_keypair (unsigned char *pk,
+                                                 unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream.h
index 88dab5f..c8efcdc 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream.h
@@ -23,34 +23,34 @@ extern "C" {
 
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_keybytes(void);
+size_t  crypto_stream_keybytes (void);
 
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_noncebytes(void);
+size_t  crypto_stream_noncebytes (void);
 
 #define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_stream_messagebytes_max(void);
+size_t  crypto_stream_messagebytes_max (void);
 
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
-const char *crypto_stream_primitive(void);
+const char *crypto_stream_primitive (void);
 
 SODIUM_EXPORT
-int crypto_stream(unsigned char *c, unsigned long long clen,
-                  const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream (unsigned char *c, unsigned long long clen,
+                   const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xor(unsigned char *c, const unsigned char *m,
-                      unsigned long long mlen, const unsigned char *n,
-                      const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xor (unsigned char *c, const unsigned char *m,
+                       unsigned long long mlen, const unsigned char *n,
+                       const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_keygen (unsigned char k[crypto_stream_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_chacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_chacha20.h
index 4088975..e276a7d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_chacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_chacha20.h
@@ -22,82 +22,89 @@ extern "C" {
 
 #define crypto_stream_chacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_keybytes(void);
+size_t crypto_stream_chacha20_keybytes (void);
 
 #define crypto_stream_chacha20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_noncebytes(void);
+size_t crypto_stream_chacha20_noncebytes (void);
 
 #define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_messagebytes_max(void);
+size_t crypto_stream_chacha20_messagebytes_max (void);
 
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
-int crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_keygen(unsigned char 
k[crypto_stream_chacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_keygen (unsigned char
+                                    k[crypto_stream_chacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
 
 #define crypto_stream_chacha20_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_keybytes(void);
+size_t crypto_stream_chacha20_ietf_keybytes (void);
 
 #define crypto_stream_chacha20_ietf_NONCEBYTES 12U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_noncebytes(void);
+size_t crypto_stream_chacha20_ietf_noncebytes (void);
 
 #define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+  SODIUM_MIN (SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+size_t crypto_stream_chacha20_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf (unsigned char *c, unsigned long long clen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
-                                    unsigned long long mlen, const unsigned 
char *n,
-                                    const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor (unsigned char *c, const unsigned char *m,
+                                     unsigned long long mlen, const unsigned
+                                     char *n,
+                                     const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char 
*m,
-                                       unsigned long long mlen,
-                                       const unsigned char *n, uint32_t ic,
-                                       const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor_ic (unsigned char *c, const unsigned
+                                        char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *n, uint32_t ic,
+                                        const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_ietf_keygen(unsigned char 
k[crypto_stream_chacha20_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_ietf_keygen (unsigned char
+                                         
k[crypto_stream_chacha20_ietf_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_stream_chacha20_IETF_KEYBYTES 
crypto_stream_chacha20_ietf_KEYBYTES
-#define crypto_stream_chacha20_IETF_NONCEBYTES 
crypto_stream_chacha20_ietf_NONCEBYTES
-#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX 
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+#define crypto_stream_chacha20_IETF_KEYBYTES \
+  crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES \
+  crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX \
+  crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa20.h
index 45b3b3e..e677477 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_keybytes(void);
+size_t crypto_stream_salsa20_keybytes (void);
 
 #define crypto_stream_salsa20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_noncebytes(void);
+size_t crypto_stream_salsa20_noncebytes (void);
 
 #define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_messagebytes_max(void);
+size_t crypto_stream_salsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
-                          const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20 (unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
-                              unsigned long long mlen, const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor (unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                 unsigned long long mlen,
-                                 const unsigned char *n, uint64_t ic,
-                                 const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa20_keygen(unsigned char 
k[crypto_stream_salsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa20_keygen (unsigned char
+                                   k[crypto_stream_salsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa2012.h
index 6c5d303..66545d1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa2012.h
@@ -21,30 +21,32 @@ extern "C" {
 
 #define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_keybytes(void);
+size_t crypto_stream_salsa2012_keybytes (void);
 
 #define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_noncebytes(void);
+size_t crypto_stream_salsa2012_noncebytes (void);
 
 #define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_messagebytes_max(void);
+size_t crypto_stream_salsa2012_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa2012_keygen(unsigned char 
k[crypto_stream_salsa2012_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa2012_keygen (unsigned char
+                                     k[crypto_stream_salsa2012_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa208.h
index d574f30..00ee015 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_salsa208.h
@@ -21,33 +21,34 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_noncebytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
-    SODIUM_EXPORT
-size_t crypto_stream_salsa208_messagebytes_max(void)
-            __attribute__ ((deprecated));
+SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char 
k[crypto_stream_salsa208_KEYBYTES])
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+void crypto_stream_salsa208_keygen (unsigned char
+                                    k[crypto_stream_salsa208_KEYBYTES])
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xchacha20.h
index c4002db..a42ba70 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xchacha20.h
@@ -22,37 +22,39 @@ extern "C" {
 
 #define crypto_stream_xchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_keybytes(void);
+size_t crypto_stream_xchacha20_keybytes (void);
 
 #define crypto_stream_xchacha20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_noncebytes(void);
+size_t crypto_stream_xchacha20_noncebytes (void);
 
 #define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_messagebytes_max(void);
+size_t crypto_stream_xchacha20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                   unsigned long long mlen,
-                                   const unsigned char *n, uint64_t ic,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen,
+                                    const unsigned char *n, uint64_t ic,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xchacha20_keygen(unsigned char 
k[crypto_stream_xchacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xchacha20_keygen (unsigned char
+                                     k[crypto_stream_xchacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xsalsa20.h
index 20034e3..60b0233 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_stream_xsalsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_keybytes(void);
+size_t crypto_stream_xsalsa20_keybytes (void);
 
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_noncebytes(void);
+size_t crypto_stream_xsalsa20_noncebytes (void);
 
 #define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_messagebytes_max(void);
+size_t crypto_stream_xsalsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xsalsa20_keygen(unsigned char 
k[crypto_stream_xsalsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xsalsa20_keygen (unsigned char
+                                    k[crypto_stream_xsalsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_16.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_16.h
index 7b9c807..ec377fd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_16.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_16.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_verify_16_bytes(void);
+size_t crypto_verify_16_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_16 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_32.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_32.h
index 9b0f452..03fa394 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_32.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_32.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_verify_32_bytes(void);
+size_t crypto_verify_32_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_32 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_64.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_64.h
index c83b730..fe18a74 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_64.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/crypto_verify_64.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_64_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_verify_64_bytes(void);
+size_t crypto_verify_64_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_64 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/export.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/export.h
index a0074fc..d943e3e 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/export.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/export.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_export_H
 #define sodium_export_H
 
@@ -6,7 +5,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if ! defined(__clang__) && ! defined(__GNUC__)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
@@ -26,7 +25,7 @@
 # else
 #  if defined(__SUNPRO_C)
 #   ifndef __GNU_C__
-#    define SODIUM_EXPORT __attribute__ (visibility(__global))
+#    define SODIUM_EXPORT __attribute__ (visibility (__global))
 #   else
 #    define SODIUM_EXPORT __attribute__ __global
 #   endif
@@ -36,7 +35,7 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
-# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+# if defined(__ELF__) && ! defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
 # else
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
@@ -45,13 +44,13 @@
 
 #ifndef CRYPTO_ALIGN
 # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
-#  define CRYPTO_ALIGN(x) __declspec(align(x))
+#  define CRYPTO_ALIGN(x) __declspec(align (x))
 # else
-#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned (x)))
 # endif
 #endif
 
 #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#define SODIUM_SIZE_MAX SODIUM_MIN (UINT64_MAX, SIZE_MAX)
 
 #endif
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes.h
index c83a4df..3539ac8 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_H
 #define randombytes_H
 
@@ -16,54 +15,56 @@
 extern "C" {
 #endif
 
-typedef struct randombytes_implementation {
-    const char *(*implementation_name)(void); /* required */
-    uint32_t    (*random)(void);              /* required */
-    void        (*stir)(void);                /* optional */
-    uint32_t    (*uniform)(const uint32_t upper_bound); /* optional, a default 
implementation will be used if NULL */
-    void        (*buf)(void * const buf, const size_t size); /* required */
-    int         (*close)(void);               /* optional */
+typedef struct randombytes_implementation
+{
+  const char *(*implementation_name)(void);   /* required */
+  uint32_t (*random)(void);                   /* required */
+  void (*stir)(void);                         /* optional */
+  uint32_t (*uniform)(const uint32_t upper_bound);      /* optional, a default 
implementation will be used if NULL */
+  void (*buf)(void *const buf, const size_t size);           /* required */
+  int (*close)(void);                         /* optional */
 } randombytes_implementation;
 
-#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+#define randombytes_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, 0xffffffffUL)
 
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t randombytes_seedbytes(void);
+size_t randombytes_seedbytes (void);
 
 SODIUM_EXPORT
-void randombytes_buf(void * const buf, const size_t size)
-            __attribute__ ((nonnull));
+void randombytes_buf (void *const buf, const size_t size)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void randombytes_buf_deterministic(void * const buf, const size_t size,
-                                   const unsigned char 
seed[randombytes_SEEDBYTES])
-            __attribute__ ((nonnull));
+void randombytes_buf_deterministic (void *const buf, const size_t size,
+                                    const unsigned char
+                                    seed[randombytes_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-uint32_t randombytes_random(void);
+uint32_t randombytes_random (void);
 
 SODIUM_EXPORT
-uint32_t randombytes_uniform(const uint32_t upper_bound);
+uint32_t randombytes_uniform (const uint32_t upper_bound);
 
 SODIUM_EXPORT
-void randombytes_stir(void);
+void randombytes_stir (void);
 
 SODIUM_EXPORT
-int randombytes_close(void);
+int randombytes_close (void);
 
 SODIUM_EXPORT
-int randombytes_set_implementation(const randombytes_implementation *impl)
-            __attribute__ ((nonnull));
+int randombytes_set_implementation (const randombytes_implementation *impl)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-const char *randombytes_implementation_name(void);
+const char *randombytes_implementation_name (void);
 
 /* -- NaCl compatibility interface -- */
 
 SODIUM_EXPORT
-void randombytes(unsigned char * const buf, const unsigned long long buf_len)
-            __attribute__ ((nonnull));
+void randombytes (unsigned char *const buf, const unsigned long long buf_len)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_internal_random.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_internal_random.h
index 2b2b7d6..d9cd6b0 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_internal_random.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_internal_random.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_internal_random_H
 #define randombytes_internal_random_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_sysrandom.h
 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_sysrandom.h
index 9e27b67..ebb284f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_sysrandom.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/randombytes_sysrandom.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_sysrandom_H
 #define randombytes_sysrandom_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/runtime.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/runtime.h
index c1cec85..471d71b 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/runtime.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/runtime.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_runtime_H
 #define sodium_runtime_H
 
@@ -9,44 +8,44 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_neon(void);
+int sodium_runtime_has_neon (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_armcrypto(void);
+int sodium_runtime_has_armcrypto (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse2(void);
+int sodium_runtime_has_sse2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse3(void);
+int sodium_runtime_has_sse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_ssse3(void);
+int sodium_runtime_has_ssse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse41(void);
+int sodium_runtime_has_sse41 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx(void);
+int sodium_runtime_has_avx (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx2(void);
+int sodium_runtime_has_avx2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx512f(void);
+int sodium_runtime_has_avx512f (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_pclmul(void);
+int sodium_runtime_has_pclmul (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_aesni(void);
+int sodium_runtime_has_aesni (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_rdrand(void);
+int sodium_runtime_has_rdrand (void);
 
 /* ------------------------------------------------------------------------- */
 
-int _sodium_runtime_get_cpu_features(void);
+int _sodium_runtime_get_cpu_features (void);
 
 #ifdef __cplusplus
 }
diff --git a/verification-app/app/src/main/cpp/libsodium/include/sodium/utils.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/utils.h
index f9b3697..39b121d 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/utils.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/utils.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_utils_H
 #define sodium_utils_H
 
@@ -11,7 +10,8 @@ extern "C" {
 #endif
 
 #ifndef SODIUM_C99
-# if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 
199901L
+# if defined(__cplusplus) || ! defined(__STDC_VERSION__) || __STDC_VERSION__ < 
\
+  199901L
 #  define SODIUM_C99(X)
 # else
 #  define SODIUM_C99(X) X
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-void sodium_memzero(void * const pnt, const size_t len);
+void sodium_memzero (void *const pnt, const size_t len);
 
 SODIUM_EXPORT
-void sodium_stackzero(const size_t len);
+void sodium_stackzero (const size_t len);
 
 /*
  * WARNING: sodium_memcmp() must be used to verify if two secret keys
@@ -31,8 +31,8 @@ void sodium_stackzero(const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
-            __attribute__ ((warn_unused_result));
+int sodium_memcmp (const void *const b1_, const void *const b2_, size_t len)
+__attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -41,32 +41,32 @@ int sodium_memcmp(const void * const b1_, const void * 
const b2_, size_t len)
  * However, it is slower than sodium_memcmp().
  */
 SODIUM_EXPORT
-int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len) __attribute__ ((warn_unused_result));
+int sodium_compare (const unsigned char *b1_, const unsigned char *b2_,
+                    size_t len) __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int sodium_is_zero(const unsigned char *n, const size_t nlen);
+int sodium_is_zero (const unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_increment(unsigned char *n, const size_t nlen);
+void sodium_increment (unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_add(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_add (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-void sodium_sub(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_sub (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,
-                     const unsigned char * const bin, const size_t bin_len)
-            __attribute__ ((nonnull(1)));
+char *sodium_bin2hex (char *const hex, const size_t hex_maxlen,
+                      const unsigned char *const bin, const size_t bin_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
-                   const char * const hex, const size_t hex_len,
-                   const char * const ignore, size_t * const bin_len,
-                   const char ** const hex_end)
-            __attribute__ ((nonnull(1)));
+int sodium_hex2bin (unsigned char *const bin, const size_t bin_maxlen,
+                    const char *const hex, const size_t hex_len,
+                    const char *const ignore, size_t *const bin_len,
+                    const char **const hex_end)
+__attribute__ ((nonnull(1)));
 
 #define sodium_base64_VARIANT_ORIGINAL            1
 #define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
@@ -78,32 +78,35 @@ int sodium_hex2bin(unsigned char * const bin, const size_t 
bin_maxlen,
  * using the given variant. The computed length includes a trailing \0.
  */
 #define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT) \
-    (((BIN_LEN) / 3U) * 4U + \
-    ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 
3U) >> 1)) & 1U) * \
-     (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) - ((BIN_LEN) / 
3U) * 3U)))) + 1U)
+  (((BIN_LEN) / 3U) * 4U   \
+   + ((((BIN_LEN) -((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) -((BIN_LEN) / 3U) \
+                                              * 3U) >> 1)) & 1U)   \
+   * (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) -((BIN_LEN) \
+                                                                 / 3U) \
+                                                     * 3U)))) + 1U)
 
 SODIUM_EXPORT
-size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+size_t sodium_base64_encoded_len (const size_t bin_len, const int variant);
 
 SODIUM_EXPORT
-char *sodium_bin2base64(char * const b64, const size_t b64_maxlen,
-                        const unsigned char * const bin, const size_t bin_len,
-                        const int variant) __attribute__ ((nonnull(1)));
+char *sodium_bin2base64 (char *const b64, const size_t b64_maxlen,
+                         const unsigned char *const bin, const size_t bin_len,
+                         const int variant) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_base642bin(unsigned char * const bin, const size_t bin_maxlen,
-                      const char * const b64, const size_t b64_len,
-                      const char * const ignore, size_t * const bin_len,
-                      const char ** const b64_end, const int variant)
-            __attribute__ ((nonnull(1)));
+int sodium_base642bin (unsigned char *const bin, const size_t bin_maxlen,
+                       const char *const b64, const size_t b64_len,
+                       const char *const ignore, size_t *const bin_len,
+                       const char **const b64_end, const int variant)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_mlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_mlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_munlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_munlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 /* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
  * allocation functions.
@@ -139,38 +142,38 @@ int sodium_munlock(void * const addr, const size_t len)
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size)
-            __attribute__ ((malloc));
+void *sodium_malloc (const size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size)
-            __attribute__ ((malloc));
+void *sodium_allocarray (size_t count, size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void sodium_free(void *ptr);
+void sodium_free (void *ptr);
 
 SODIUM_EXPORT
-int sodium_mprotect_noaccess(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_noaccess (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readonly(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readonly (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readwrite(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readwrite (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
-               size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
-            __attribute__ ((nonnull(2)));
+int sodium_pad (size_t *padded_buflen_p, unsigned char *buf,
+                size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+__attribute__ ((nonnull(2)));
 
 SODIUM_EXPORT
-int sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
-                 size_t padded_buflen, size_t blocksize)
-            __attribute__ ((nonnull(2)));
+int sodium_unpad (size_t *unpadded_buflen_p, const unsigned char *buf,
+                  size_t padded_buflen, size_t blocksize)
+__attribute__ ((nonnull(2)));
 
 /* -------- */
 
-int _sodium_alloc_init(void);
+int _sodium_alloc_init (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/include/sodium/version.h 
b/verification-app/app/src/main/cpp/libsodium/include/sodium/version.h
index 022ab11..cec1b92 100644
--- a/verification-app/app/src/main/cpp/libsodium/include/sodium/version.h
+++ b/verification-app/app/src/main/cpp/libsodium/include/sodium/version.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_version_H
 #define sodium_version_H
 
@@ -15,16 +14,16 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-const char *sodium_version_string(void);
+const char *sodium_version_string (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_major(void);
+int         sodium_library_version_major (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_minor(void);
+int         sodium_library_version_minor (void);
 
 SODIUM_EXPORT
-int         sodium_library_minimal(void);
+int         sodium_library_minimal (void);
 
 #ifdef __cplusplus
 }
diff --git a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium.h
index 86b7a4d..f11f028 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_H
 #define sodium_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/core.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/core.h
index dd088d2..921c7e6 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/core.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/core.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_core_H
 #define sodium_core_H
 
@@ -9,17 +8,17 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int sodium_init(void)
-            __attribute__ ((warn_unused_result));
+int sodium_init (void)
+__attribute__ ((warn_unused_result));
 
 /* ---- */
 
 SODIUM_EXPORT
-int sodium_set_misuse_handler(void (*handler)(void));
+int sodium_set_misuse_handler (void (*handler)(void));
 
 SODIUM_EXPORT
-void sodium_misuse(void)
-            __attribute__ ((noreturn));
+void sodium_misuse (void)
+__attribute__ ((noreturn));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis128l.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis128l.h
index 0ad019f..ba8a2c6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis128l.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis128l.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis128l_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_keybytes(void);
+size_t crypto_aead_aegis128l_keybytes (void);
 
 #define crypto_aead_aegis128l_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_nsecbytes(void);
+size_t crypto_aead_aegis128l_nsecbytes (void);
 
 #define crypto_aead_aegis128l_NPUBBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_npubbytes(void);
+size_t crypto_aead_aegis128l_npubbytes (void);
 
 #define crypto_aead_aegis128l_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_abytes(void);
+size_t crypto_aead_aegis128l_abytes (void);
 
 #define crypto_aead_aegis128l_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 
1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_messagebytes_max(void);
+size_t crypto_aead_aegis128l_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt(unsigned char       *c,
-                                  unsigned long long  *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long   mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis128l_encrypt (unsigned char       *c,
+                                   unsigned long long  *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt(unsigned char       *m,
-                                  unsigned long long  *mlen_p,
-                                  unsigned char       *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long   clen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis128l_decrypt (unsigned char       *m,
+                                   unsigned long long  *mlen_p,
+                                   unsigned char       *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt_detached(unsigned char       *c,
-                                           unsigned char       *mac,
-                                           unsigned long long  *maclen_p,
-                                           const unsigned char *m,
-                                           unsigned long long   mlen,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *nsec,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis128l_encrypt_detached (unsigned char       *c,
+                                            unsigned char       *mac,
+                                            unsigned long long  *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt_detached(unsigned char       *m,
-                                           unsigned char       *nsec,
-                                           const unsigned char *c,
-                                           unsigned long long   clen,
-                                           const unsigned char *mac,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis128l_decrypt_detached (unsigned char       *m,
+                                            unsigned char       *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis128l_keygen(unsigned char 
k[crypto_aead_aegis128l_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis128l_keygen (unsigned char
+                                   k[crypto_aead_aegis128l_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis256.h
index 26bd18a..6b3feff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aegis256.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_keybytes(void);
+size_t crypto_aead_aegis256_keybytes (void);
 
 #define crypto_aead_aegis256_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_nsecbytes(void);
+size_t crypto_aead_aegis256_nsecbytes (void);
 
 #define crypto_aead_aegis256_NPUBBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_npubbytes(void);
+size_t crypto_aead_aegis256_npubbytes (void);
 
 #define crypto_aead_aegis256_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_abytes(void);
+size_t crypto_aead_aegis256_abytes (void);
 
 #define crypto_aead_aegis256_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_messagebytes_max(void);
+size_t crypto_aead_aegis256_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt(unsigned char       *c,
-                                 unsigned long long  *clen_p,
-                                 const unsigned char *m,
-                                 unsigned long long   mlen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *nsec,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis256_encrypt (unsigned char       *c,
+                                  unsigned long long  *clen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *nsec,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt(unsigned char       *m,
-                                 unsigned long long  *mlen_p,
-                                 unsigned char       *nsec,
-                                 const unsigned char *c,
-                                 unsigned long long   clen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis256_decrypt (unsigned char       *m,
+                                  unsigned long long  *mlen_p,
+                                  unsigned char       *nsec,
+                                  const unsigned char *c,
+                                  unsigned long long clen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt_detached(unsigned char       *c,
-                                          unsigned char       *mac,
-                                          unsigned long long  *maclen_p,
-                                          const unsigned char *m,
-                                          unsigned long long   mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis256_encrypt_detached (unsigned char       *c,
+                                           unsigned char       *mac,
+                                           unsigned long long  *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt_detached(unsigned char       *m,
-                                          unsigned char       *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long   clen,
-                                          const unsigned char *mac,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis256_decrypt_detached (unsigned char       *m,
+                                           unsigned char       *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis256_keygen(unsigned char 
k[crypto_aead_aegis256_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis256_keygen (unsigned char
+                                  k[crypto_aead_aegis256_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aes256gcm.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aes256gcm.h
index 9baeb3f..5d259ff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aes256gcm.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_aes256gcm.h
@@ -32,145 +32,154 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_is_available(void);
+int crypto_aead_aes256gcm_is_available (void);
 
 #define crypto_aead_aes256gcm_KEYBYTES  32U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_keybytes(void);
+size_t crypto_aead_aes256gcm_keybytes (void);
 
 #define crypto_aead_aes256gcm_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_nsecbytes(void);
+size_t crypto_aead_aes256gcm_nsecbytes (void);
 
 #define crypto_aead_aes256gcm_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_npubbytes(void);
+size_t crypto_aead_aes256gcm_npubbytes (void);
 
 #define crypto_aead_aes256gcm_ABYTES    16U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_abytes(void);
+size_t crypto_aead_aes256gcm_abytes (void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)))
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
+              (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_messagebytes_max(void);
+size_t crypto_aead_aes256gcm_messagebytes_max (void);
 
-typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_ {
-    unsigned char opaque[512];
+typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_
+{
+  unsigned char opaque[512];
 } crypto_aead_aes256gcm_state;
 
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_statebytes(void);
+size_t crypto_aead_aes256gcm_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt(unsigned char *c,
-                                  unsigned long long *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_aes256gcm_encrypt (unsigned char *c,
+                                   unsigned long long *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt (unsigned char *m,
+                                   unsigned long long *mlen_p,
+                                   unsigned char *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached (unsigned char *c,
+                                            unsigned char *mac,
+                                            unsigned long long *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached (unsigned char *m,
+                                            unsigned char *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+/* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt(unsigned char *m,
-                                  unsigned long long *mlen_p,
-                                  unsigned char *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long clen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_aes256gcm_beforenm (crypto_aead_aes256gcm_state *ctx_,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
-                                           unsigned char *mac,
-                                           unsigned long long *maclen_p,
+int crypto_aead_aes256gcm_encrypt_afternm (unsigned char *c,
+                                           unsigned long long *clen_p,
                                            const unsigned char *m,
                                            unsigned long long mlen,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *nsec,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+int crypto_aead_aes256gcm_decrypt_afternm (unsigned char *m,
+                                           unsigned long long *mlen_p,
                                            unsigned char *nsec,
                                            const unsigned char *c,
                                            unsigned long long clen,
-                                           const unsigned char *mac,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-/* -- Precomputation interface -- */
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_afternm(unsigned char *c,
-                                          unsigned long long *clen_p,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
-                                          unsigned long long *mlen_p,
-                                          unsigned char *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long clen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
-                                                   unsigned char *mac,
-                                                   unsigned long long 
*maclen_p,
-                                                   const unsigned char *m,
-                                                   unsigned long long mlen,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *nsec,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
-                                                   unsigned char *nsec,
-                                                   const unsigned char *c,
-                                                   unsigned long long clen,
-                                                   const unsigned char *mac,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_aes256gcm_keygen(unsigned char 
k[crypto_aead_aes256gcm_KEYBYTES])
-            __attribute__ ((nonnull));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm (unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long
+                                                    long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm (unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_aes256gcm_keygen (unsigned char
+                                   k[crypto_aead_aes256gcm_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_chacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_chacha20poly1305.h
index 5d671df..686f5aa 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_chacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_chacha20poly1305.h
@@ -15,163 +15,181 @@ extern "C" {
 
 #define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
 
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * ((1ULL << 32) - 1ULL)))
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                       unsigned char *mac,
-                                                       unsigned long long 
*maclen_p,
-                                                       const unsigned char *m,
-                                                       unsigned long long mlen,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*nsec,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                       unsigned char *nsec,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char 
*mac,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+              (64ULL * ((1ULL << 32) - 1ULL)))
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt (unsigned char *c,
+                                               unsigned long long *clen_p,
+                                               const unsigned char *m,
+                                               unsigned long long mlen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *nsec,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt (unsigned char *m,
+                                               unsigned long long *mlen_p,
+                                               unsigned char *nsec,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                        unsigned char *mac,
+                                                        unsigned long
+                                                        long *maclen_p,
+                                                        const unsigned char *m,
+                                                        unsigned long long 
mlen,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *nsec,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                        unsigned char *nsec,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned
+                                                        char *mac,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_ietf_keygen (unsigned char
+                                               k[
+                                                 
crypto_aead_chacha20poly1305_ietf_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit 
internal counter -- */
 
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_keybytes(void);
+size_t crypto_aead_chacha20poly1305_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_NPUBBYTES 8U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_abytes(void);
+size_t crypto_aead_chacha20poly1305_abytes (void);
 
 #define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
-                                         unsigned long long *clen_p,
-                                         const unsigned char *m,
-                                         unsigned long long mlen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *nsec,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
-                                         unsigned long long *mlen_p,
-                                         unsigned char *nsec,
-                                         const unsigned char *c,
-                                         unsigned long long clen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
-                                                  unsigned char *mac,
-                                                  unsigned long long *maclen_p,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *nsec,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
-                                                  unsigned char *nsec,
-                                                  const unsigned char *c,
-                                                  unsigned long long clen,
-                                                  const unsigned char *mac,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt (unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt (unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt_detached (unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long 
*maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt_detached (unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_keygen (unsigned char
+                                          k[
+                                            
crypto_aead_chacha20poly1305_KEYBYTES
+                                          ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         
crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        
crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        
crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES           
crypto_aead_chacha20poly1305_ietf_ABYTES
-#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           \
+  crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_xchacha20poly1305.h
index 6643b0c..6bdd39f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_aead_xchacha20poly1305.h
@@ -13,85 +13,104 @@ extern "C" {
 
 #define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
-                                               unsigned long long *clen_p,
-                                               const unsigned char *m,
-                                               unsigned long long mlen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *nsec,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt (unsigned char *c,
+                                                unsigned long long *clen_p,
+                                                const unsigned char *m,
+                                                unsigned long long mlen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *nsec,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
-                                               unsigned long long *mlen_p,
-                                               unsigned char *nsec,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt (unsigned char *m,
+                                                unsigned long long *mlen_p,
+                                                unsigned char *nsec,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                        unsigned char *mac,
-                                                        unsigned long long 
*maclen_p,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*nsec,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                         unsigned char *mac,
+                                                         unsigned long
+                                                         long *maclen_p,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *nsec,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                        unsigned char *nsec,
-                                                        const unsigned char *c,
-                                                        unsigned long long 
clen,
-                                                        const unsigned char 
*mac,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                         unsigned char *nsec,
+                                                         const unsigned char 
*c,
+                                                         unsigned long long
+                                                         clen,
+                                                         const unsigned
+                                                         char *mac,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_aead_xchacha20poly1305_ietf_keygen (unsigned char
+                                                k[
+                                                  
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+                                                ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        
crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        
crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES           
crypto_aead_xchacha20poly1305_ietf_ABYTES
-#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           \
+  crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth.h
index 540aee0..ef7e5d9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth.h
@@ -15,29 +15,29 @@ extern "C" {
 
 #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
 SODIUM_EXPORT
-size_t  crypto_auth_bytes(void);
+size_t  crypto_auth_bytes (void);
 
 #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_auth_keybytes(void);
+size_t  crypto_auth_keybytes (void);
 
 #define crypto_auth_PRIMITIVE "hmacsha512256"
 SODIUM_EXPORT
-const char *crypto_auth_primitive(void);
+const char *crypto_auth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_auth(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_auth (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_verify (const unsigned char *h, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_auth_keygen(unsigned char k[crypto_auth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_keygen (unsigned char k[crypto_auth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha256.h
index 3da864c..925d0cc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha256.h
@@ -14,54 +14,57 @@ extern "C" {
 
 #define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_bytes(void);
+size_t crypto_auth_hmacsha256_bytes (void);
 
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_keybytes(void);
+size_t crypto_auth_hmacsha256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha256_state {
-    crypto_hash_sha256_state ictx;
-    crypto_hash_sha256_state octx;
+typedef struct crypto_auth_hmacsha256_state
+{
+  crypto_hash_sha256_state ictx;
+  crypto_hash_sha256_state octx;
 } crypto_auth_hmacsha256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_statebytes(void);
+size_t crypto_auth_hmacsha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_init (crypto_auth_hmacsha256_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_auth_hmacsha256_update (crypto_auth_hmacsha256_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_final (crypto_auth_hmacsha256_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha256_keygen(unsigned char 
k[crypto_auth_hmacsha256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha256_keygen (unsigned char
+                                    k[crypto_auth_hmacsha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512.h
index d992cb8..e5fd3ca 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512.h
@@ -14,52 +14,56 @@ extern "C" {
 
 #define crypto_auth_hmacsha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_bytes(void);
+size_t crypto_auth_hmacsha512_bytes (void);
 
 #define crypto_auth_hmacsha512_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_keybytes(void);
+size_t crypto_auth_hmacsha512_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha512_state {
-    crypto_hash_sha512_state ictx;
-    crypto_hash_sha512_state octx;
+typedef struct crypto_auth_hmacsha512_state
+{
+  crypto_hash_sha512_state ictx;
+  crypto_hash_sha512_state octx;
 } crypto_auth_hmacsha512_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_statebytes(void);
+size_t crypto_auth_hmacsha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_init (crypto_auth_hmacsha512_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512_update (crypto_auth_hmacsha512_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_final (crypto_auth_hmacsha512_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512_keygen(unsigned char 
k[crypto_auth_hmacsha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512_keygen (unsigned char
+                                    k[crypto_auth_hmacsha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512256.h
index 3fb5263..25a0787 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_auth_hmacsha512256.h
@@ -14,49 +14,53 @@ extern "C" {
 
 #define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_bytes(void);
+size_t crypto_auth_hmacsha512256_bytes (void);
 
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_keybytes(void);
+size_t crypto_auth_hmacsha512256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *out,
-                              const unsigned char *in,
-                              unsigned long long inlen,
-                              const unsigned char *k) __attribute__ 
((nonnull(1, 4)));
+int crypto_auth_hmacsha512256 (unsigned char *out,
+                               const unsigned char *in,
+                               unsigned long long inlen,
+                               const unsigned char *k) __attribute__ (
+  (nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *h,
-                                     const unsigned char *in,
-                                     unsigned long long inlen,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512256_verify (const unsigned char *h,
+                                      const unsigned char *in,
+                                      unsigned long long inlen,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
 typedef crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_statebytes(void);
+size_t crypto_auth_hmacsha512256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
-                                   const unsigned char *key,
-                                   size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512256_init (crypto_auth_hmacsha512256_state *state,
+                                    const unsigned char *key,
+                                    size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
-                                     const unsigned char *in,
-                                     unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512256_update (crypto_auth_hmacsha512256_state *state,
+                                      const unsigned char *in,
+                                      unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
-                                    unsigned char *out) __attribute__ 
((nonnull));
+int crypto_auth_hmacsha512256_final (crypto_auth_hmacsha512256_state *state,
+                                     unsigned char *out) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512256_keygen(unsigned char 
k[crypto_auth_hmacsha512256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512256_keygen (unsigned char
+                                       k[crypto_auth_hmacsha512256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box.h
index e060dd2..41190bd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box.h
@@ -22,153 +22,164 @@ extern "C" {
 
 #define crypto_box_SEEDBYTES crypto_box_curve25519xsalsa20poly1305_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_box_seedbytes(void);
+size_t  crypto_box_seedbytes (void);
 
-#define crypto_box_PUBLICKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_PUBLICKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_publickeybytes(void);
+size_t  crypto_box_publickeybytes (void);
 
-#define crypto_box_SECRETKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_SECRETKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_secretkeybytes(void);
+size_t  crypto_box_secretkeybytes (void);
 
 #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_box_noncebytes(void);
+size_t  crypto_box_noncebytes (void);
 
 #define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_box_macbytes(void);
+size_t  crypto_box_macbytes (void);
 
-#define crypto_box_MESSAGEBYTES_MAX 
crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_box_MESSAGEBYTES_MAX \
+  crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_box_messagebytes_max(void);
+size_t  crypto_box_messagebytes_max (void);
 
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_box_primitive(void);
+const char *crypto_box_primitive (void);
 
 SODIUM_EXPORT
-int crypto_box_seed_keypair(unsigned char *pk, unsigned char *sk,
-                            const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_box_seed_keypair (unsigned char *pk, unsigned char *sk,
+                             const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_easy (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen, const unsigned char *n,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open_easy (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen, const unsigned char *n,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_detached(unsigned char *c, unsigned char *mac,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
+int crypto_box_detached (unsigned char *c, unsigned char *mac,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *n, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
-                             const unsigned char *mac,
-                             unsigned long long clen,
-                             const unsigned char *n,
-                             const unsigned char *pk,
-                             const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+int crypto_box_open_detached (unsigned char *m, const unsigned char *c,
+                              const unsigned char *mac,
+                              unsigned long long clen,
+                              const unsigned char *n,
+                              const unsigned char *pk,
+                              const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
-#define crypto_box_BEFORENMBYTES 
crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_BEFORENMBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
 SODIUM_EXPORT
-size_t  crypto_box_beforenmbytes(void);
+size_t  crypto_box_beforenmbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_beforenm (unsigned char *k, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_box_easy_afternm (unsigned char *c, const unsigned char *m,
+                             unsigned long long mlen, const unsigned char *n,
+                             const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                             4,
+                                                                             
5)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
-                                 unsigned long long clen, const unsigned char 
*n,
-                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_easy_afternm (unsigned char *m, const unsigned char *c,
+                                  unsigned long long clen, const unsigned
+                                  char *n,
+                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
-                                const unsigned char *m, unsigned long long 
mlen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_detached_afternm (unsigned char *c, unsigned char *mac,
+                                 const unsigned char *m, unsigned long long
+                                 mlen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
-                                     const unsigned char *mac,
-                                     unsigned long long clen, const unsigned 
char *n,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_open_detached_afternm (unsigned char *m, const unsigned char *c,
+                                      const unsigned char *mac,
+                                      unsigned long long clen, const unsigned
+                                      char *n,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_SEALBYTES (crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_sealbytes(void);
+size_t crypto_box_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_seal(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_seal (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_seal_open (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_zerobytes(void);
+size_t  crypto_box_zerobytes (void);
 
-#define crypto_box_BOXZEROBYTES 
crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_BOXZEROBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_boxzerobytes(void);
+size_t  crypto_box_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box(unsigned char *c, const unsigned char *m,
-               unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box (unsigned char *c, const unsigned char *m,
+                unsigned long long mlen, const unsigned char *n,
+                const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open(unsigned char *m, const unsigned char *c,
-                    unsigned long long clen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open (unsigned char *m, const unsigned char *c,
+                     unsigned long long clen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_afternm(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen, const unsigned char *n,
-                       const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_box_afternm (unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                        5)));
 
 SODIUM_EXPORT
-int crypto_box_open_afternm(unsigned char *m, const unsigned char *c,
-                            unsigned long long clen, const unsigned char *n,
-                            const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_afternm (unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xchacha20poly1305.h
index 26a3d31..092da6d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xchacha20poly1305.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_box_curve25519xchacha20poly1305_H
 #define crypto_box_curve25519xchacha20poly1305_H
 
@@ -15,147 +14,170 @@ extern "C" {
 
 #define crypto_box_curve25519xchacha20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_macbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max (void);
+
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+int crypto_box_curve25519xchacha20poly1305_seed_keypair (unsigned char *pk,
+                                                         unsigned char *sk,
+                                                         const unsigned
+                                                         char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
-                                                        unsigned char *sk,
-                                                        const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_keypair (unsigned char *pk,
+                                                    unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk,
-                                                   unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_easy (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *pk,
+                                                 const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *pk,
-                                                const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_open_easy (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
+int crypto_box_curve25519xchacha20poly1305_detached (unsigned char *c,
+                                                     unsigned char *mac,
+                                                     const unsigned char *m,
+                                                     unsigned long long mlen,
                                                      const unsigned char *n,
                                                      const unsigned char *pk,
                                                      const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c,
-                                                    unsigned char *mac,
-                                                    const unsigned char *m,
-                                                    unsigned long long mlen,
-                                                    const unsigned char *n,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m,
-                                                         const unsigned char 
*c,
-                                                         const unsigned char 
*mac,
-                                                         unsigned long long 
clen,
-                                                         const unsigned char 
*n,
-                                                         const unsigned char 
*pk,
-                                                         const unsigned char 
*sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached (unsigned char *m,
+                                                          const unsigned
+                                                          char *c,
+                                                          const unsigned
+                                                          char *mac,
+                                                          unsigned long long
+                                                          clen,
+                                                          const unsigned
+                                                          char *n,
+                                                          const unsigned
+                                                          char *pk,
+                                                          const unsigned
+                                                          char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char *n,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m,
-                                                             const unsigned 
char *c,
-                                                             unsigned long 
long clen,
-                                                             const unsigned 
char *n,
-                                                             const unsigned 
char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c,
-                                                            unsigned char *mac,
-                                                            const unsigned 
char *m,
-                                                            unsigned long long 
mlen,
-                                                            const unsigned 
char *n,
-                                                            const unsigned 
char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_curve25519xchacha20poly1305_beforenm (unsigned char *k,
+                                                     const unsigned char *pk,
+                                                     const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char 
*m,
-                                                                 const 
unsigned char *c,
-                                                                 const 
unsigned char *mac,
-                                                                 unsigned long 
long clen,
-                                                                 const 
unsigned char *n,
-                                                                 const 
unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_easy_afternm (unsigned char *c,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned char 
*n,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_easy_afternm (unsigned char *m,
+                                                              const unsigned
+                                                              char *c,
+                                                              unsigned long 
long
+                                                              clen,
+                                                              const unsigned
+                                                              char *n,
+                                                              const unsigned
+                                                              char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_detached_afternm (unsigned char *c,
+                                                             unsigned char 
*mac,
+                                                             const unsigned
+                                                             char *m,
+                                                             unsigned long long
+                                                             mlen,
+                                                             const unsigned
+                                                             char *n,
+                                                             const unsigned
+                                                             char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached_afternm (unsigned
+                                                                  char *m,
+                                                                  const 
unsigned
+                                                                  char *c,
+                                                                  const 
unsigned
+                                                                  char *mac,
+                                                                  unsigned long
+                                                                  long clen,
+                                                                  const 
unsigned
+                                                                  char *n,
+                                                                  const 
unsigned
+                                                                  char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_curve25519xchacha20poly1305_SEALBYTES \
-    (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES + \
-     crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES   \
+   + crypto_box_curve25519xchacha20poly1305_MACBYTES)
 
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_sealbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_curve25519xchacha20poly1305_seal (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal_open(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
-                                                     const unsigned char *pk,
-                                                     const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xchacha20poly1305_seal_open (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index e733f49..32e6b32 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -14,96 +14,98 @@ extern "C" {
 
 #define crypto_box_curve25519xsalsa20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair (unsigned char *pk,
+                                                        unsigned char *sk,
+                                                        const unsigned
+                                                        char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_keypair (unsigned char *pk,
+                                                   unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_beforenm (unsigned char *k,
+                                                    const unsigned char *pk,
+                                                    const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \
-    (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_zerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *n,
-                                          const unsigned char *pk,
-                                          const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305 (unsigned char *c,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *n,
+                                           const unsigned char *pk,
+                                           const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *n,
-                                               const unsigned char *pk,
-                                               const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305_open (unsigned char *m,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *n,
+                                                const unsigned char *pk,
+                                                const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *n,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_box_curve25519xsalsa20poly1305_afternm (unsigned char *c,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *n,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char *n,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xsalsa20poly1305_open_afternm (unsigned char *m,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned char *n,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ed25519.h
index dcc46a6..78800dc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ed25519.h
@@ -10,88 +10,92 @@ extern "C" {
 
 #define crypto_core_ed25519_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_bytes(void);
+size_t crypto_core_ed25519_bytes (void);
 
 #define crypto_core_ed25519_UNIFORMBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_uniformbytes(void);
+size_t crypto_core_ed25519_uniformbytes (void);
 
 #define crypto_core_ed25519_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_hashbytes(void);
+size_t crypto_core_ed25519_hashbytes (void);
 
 #define crypto_core_ed25519_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_scalarbytes(void);
+size_t crypto_core_ed25519_scalarbytes (void);
 
 #define crypto_core_ed25519_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_nonreducedscalarbytes(void);
+size_t crypto_core_ed25519_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ed25519_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_add(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_add (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_sub(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_sub (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_from_uniform (unsigned char *p, const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h)
-            __attribute__ ((nonnull)) __attribute__ ((deprecated));
+int crypto_core_ed25519_from_hash (unsigned char *p, const unsigned char *h)
+__attribute__ ((nonnull)) __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_scalar_invert(unsigned char *recip, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_scalar_invert (unsigned char *recip, const unsigned
+                                       char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_negate(unsigned char *neg, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_negate (unsigned char *neg, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_complement(unsigned char *comp, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_complement (unsigned char *comp, const unsigned
+                                            char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_add(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_add (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_sub(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_sub (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_mul(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_mul (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_reduce(unsigned char *r, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_reduce (unsigned char *r, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hchacha20.h
index ece141b..692f833 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hchacha20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hchacha20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_outputbytes(void);
+size_t crypto_core_hchacha20_outputbytes (void);
 
 #define crypto_core_hchacha20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_inputbytes(void);
+size_t crypto_core_hchacha20_inputbytes (void);
 
 #define crypto_core_hchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_keybytes(void);
+size_t crypto_core_hchacha20_keybytes (void);
 
 #define crypto_core_hchacha20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_constbytes(void);
+size_t crypto_core_hchacha20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hchacha20 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hsalsa20.h
index 4bf7a48..67ecdab 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_hsalsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_outputbytes(void);
+size_t crypto_core_hsalsa20_outputbytes (void);
 
 #define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_inputbytes(void);
+size_t crypto_core_hsalsa20_inputbytes (void);
 
 #define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_keybytes(void);
+size_t crypto_core_hsalsa20_keybytes (void);
 
 #define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_constbytes(void);
+size_t crypto_core_hsalsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hsalsa20 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ristretto255.h
index f2820e5..053957a 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_ristretto255.h
@@ -10,88 +10,90 @@ extern "C" {
 
 #define crypto_core_ristretto255_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_bytes(void);
+size_t crypto_core_ristretto255_bytes (void);
 
 #define crypto_core_ristretto255_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_hashbytes(void);
+size_t crypto_core_ristretto255_hashbytes (void);
 
 #define crypto_core_ristretto255_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_scalarbytes(void);
+size_t crypto_core_ristretto255_scalarbytes (void);
 
 #define crypto_core_ristretto255_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_nonreducedscalarbytes(void);
+size_t crypto_core_ristretto255_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_add(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_add (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_sub(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_sub (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_from_hash(unsigned char *p,
-                                       const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_from_hash (unsigned char *p,
+                                        const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_scalar_invert(unsigned char *recip,
-                                           const unsigned char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_scalar_invert (unsigned char *recip,
+                                            const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_negate(unsigned char *neg,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_negate (unsigned char *neg,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_complement(unsigned char *comp,
-                                                const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_complement (unsigned char *comp,
+                                                 const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_add(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_add (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_sub(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_sub (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_mul(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_mul (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_reduce(unsigned char *r,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_reduce (unsigned char *r,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa20.h
index bd79fd9..ffea366 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_outputbytes(void);
+size_t crypto_core_salsa20_outputbytes (void);
 
 #define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_inputbytes(void);
+size_t crypto_core_salsa20_inputbytes (void);
 
 #define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_keybytes(void);
+size_t crypto_core_salsa20_keybytes (void);
 
 #define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_constbytes(void);
+size_t crypto_core_salsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
-                        const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa20 (unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa2012.h
index 0595759..70740ac 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa2012.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_outputbytes(void);
+size_t crypto_core_salsa2012_outputbytes (void);
 
 #define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_inputbytes(void);
+size_t crypto_core_salsa2012_inputbytes (void);
 
 #define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_keybytes(void);
+size_t crypto_core_salsa2012_keybytes (void);
 
 #define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_constbytes(void);
+size_t crypto_core_salsa2012_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa2012 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa208.h
index d2f216a..fb91b43 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_core_salsa208.h
@@ -10,28 +10,28 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_outputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_inputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_constbytes (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa208 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash.h
index d897e5d..afe7a1e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash.h
@@ -15,31 +15,31 @@ extern "C" {
 
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_min(void);
+size_t  crypto_generichash_bytes_min (void);
 
 #define crypto_generichash_BYTES_MAX crypto_generichash_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_max(void);
+size_t  crypto_generichash_bytes_max (void);
 
 #define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
+size_t  crypto_generichash_bytes (void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_min(void);
+size_t  crypto_generichash_keybytes_min (void);
 
 #define crypto_generichash_KEYBYTES_MAX crypto_generichash_blake2b_KEYBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_max(void);
+size_t  crypto_generichash_keybytes_max (void);
 
 #define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_keybytes (void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_generichash_primitive(void);
+const char *crypto_generichash_primitive (void);
 
 /*
  * Important when writing bindings for other programming languages:
@@ -48,34 +48,34 @@ const char *crypto_generichash_primitive(void);
 typedef crypto_generichash_blake2b_state crypto_generichash_state;
 
 SODIUM_EXPORT
-size_t  crypto_generichash_statebytes(void);
+size_t  crypto_generichash_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash(unsigned char *out, size_t outlen,
-                       const unsigned char *in, unsigned long long inlen,
-                       const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash (unsigned char *out, size_t outlen,
+                        const unsigned char *in, unsigned long long inlen,
+                        const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_init(crypto_generichash_state *state,
-                            const unsigned char *key,
-                            const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_init (crypto_generichash_state *state,
+                             const unsigned char *key,
+                             const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_update(crypto_generichash_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_update (crypto_generichash_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_final(crypto_generichash_state *state,
-                             unsigned char *out, const size_t outlen)
-            __attribute__ ((nonnull));
+int crypto_generichash_final (crypto_generichash_state *state,
+                              unsigned char *out, const size_t outlen)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_keygen (unsigned char k[crypto_generichash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash_blake2b.h
index ae3b52f..e0e4462 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_generichash_blake2b.h
@@ -22,8 +22,9 @@ extern "C" {
 # pragma pack(push, 1)
 #endif
 
-typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state {
-    unsigned char opaque[384];
+typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state
+{
+  unsigned char opaque[384];
 } crypto_generichash_blake2b_state;
 
 #ifdef __IBMC__
@@ -36,84 +37,89 @@ typedef struct CRYPTO_ALIGN(64) 
crypto_generichash_blake2b_state {
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_min(void);
+size_t crypto_generichash_blake2b_bytes_min (void);
 
 #define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_max(void);
+size_t crypto_generichash_blake2b_bytes_max (void);
 
 #define crypto_generichash_blake2b_BYTES         32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes(void);
+size_t crypto_generichash_blake2b_bytes (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_min(void);
+size_t crypto_generichash_blake2b_keybytes_min (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_max(void);
+size_t crypto_generichash_blake2b_keybytes_max (void);
 
 #define crypto_generichash_blake2b_KEYBYTES      32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes(void);
+size_t crypto_generichash_blake2b_keybytes (void);
 
 #define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_saltbytes(void);
+size_t crypto_generichash_blake2b_saltbytes (void);
 
 #define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_personalbytes(void);
+size_t crypto_generichash_blake2b_personalbytes (void);
 
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_statebytes(void);
+size_t crypto_generichash_blake2b_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
-                               const unsigned char *in,
-                               unsigned long long inlen,
-                               const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b (unsigned char *out, size_t outlen,
+                                const unsigned char *in,
+                                unsigned long long inlen,
+                                const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
-                                             const unsigned char *in,
-                                             unsigned long long inlen,
-                                             const unsigned char *key,
-                                             size_t keylen,
-                                             const unsigned char *salt,
-                                             const unsigned char *personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_salt_personal (unsigned char *out, size_t 
outlen,
+                                              const unsigned char *in,
+                                              unsigned long long inlen,
+                                              const unsigned char *key,
+                                              size_t keylen,
+                                              const unsigned char *salt,
+                                              const unsigned char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
-                                    const unsigned char *key,
-                                    const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init (crypto_generichash_blake2b_state *state,
+                                     const unsigned char *key,
+                                     const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int 
crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state 
*state,
-                                                  const unsigned char *key,
-                                                  const size_t keylen, const 
size_t outlen,
-                                                  const unsigned char *salt,
-                                                  const unsigned char 
*personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init_salt_personal (
+  crypto_generichash_blake2b_state *state,
+  const unsigned char *key,
+  const size_t keylen, const
+  size_t outlen,
+  const unsigned char *salt,
+  const unsigned
+  char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
-                                      const unsigned char *in,
-                                      unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_update (crypto_generichash_blake2b_state *state,
+                                       const unsigned char *in,
+                                       unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
-                                     unsigned char *out,
-                                     const size_t outlen) __attribute__ 
((nonnull));
+int crypto_generichash_blake2b_final (crypto_generichash_blake2b_state *state,
+                                      unsigned char *out,
+                                      const size_t outlen) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_blake2b_keygen(unsigned char 
k[crypto_generichash_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_blake2b_keygen (unsigned char
+                                        k[crypto_generichash_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash.h
index 767d548..a0ac1fe 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash.h
@@ -22,16 +22,16 @@ extern "C" {
 
 #define crypto_hash_BYTES crypto_hash_sha512_BYTES
 SODIUM_EXPORT
-size_t crypto_hash_bytes(void);
+size_t crypto_hash_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 #define crypto_hash_PRIMITIVE "sha512"
 SODIUM_EXPORT
-const char *crypto_hash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_hash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha256.h
index c47982a..2adabae 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha256.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha256_state {
-    uint32_t state[8];
-    uint64_t count;
-    uint8_t  buf[64];
+typedef struct crypto_hash_sha256_state
+{
+  uint32_t state[8];
+  uint64_t count;
+  uint8_t buf[64];
 } crypto_hash_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha256_statebytes(void);
+size_t crypto_hash_sha256_statebytes (void);
 
 #define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_hash_sha256_bytes(void);
+size_t crypto_hash_sha256_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha256 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_init(crypto_hash_sha256_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_init (crypto_hash_sha256_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha256_update (crypto_hash_sha256_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_final (crypto_hash_sha256_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha512.h
index 5b690fb..b9618a7 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_hash_sha512.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha512_state {
-    uint64_t state[8];
-    uint64_t count[2];
-    uint8_t  buf[128];
+typedef struct crypto_hash_sha512_state
+{
+  uint64_t state[8];
+  uint64_t count[2];
+  uint8_t buf[128];
 } crypto_hash_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha512_statebytes(void);
+size_t crypto_hash_sha512_statebytes (void);
 
 #define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_hash_sha512_bytes(void);
+size_t crypto_hash_sha512_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha512 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_init(crypto_hash_sha512_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_init (crypto_hash_sha512_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha512_update (crypto_hash_sha512_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_final (crypto_hash_sha512_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf.h
index ac2fc61..f083146 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf.h
@@ -16,35 +16,35 @@ extern "C" {
 
 #define crypto_kdf_BYTES_MIN crypto_kdf_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_min(void);
+size_t crypto_kdf_bytes_min (void);
 
 #define crypto_kdf_BYTES_MAX crypto_kdf_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_max(void);
+size_t crypto_kdf_bytes_max (void);
 
 #define crypto_kdf_CONTEXTBYTES crypto_kdf_blake2b_CONTEXTBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_contextbytes(void);
+size_t crypto_kdf_contextbytes (void);
 
 #define crypto_kdf_KEYBYTES crypto_kdf_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_keybytes(void);
+size_t crypto_kdf_keybytes (void);
 
 #define crypto_kdf_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_kdf_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_kdf_primitive (void)
+__attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int crypto_kdf_derive_from_key(unsigned char *subkey, size_t subkey_len,
-                               uint64_t subkey_id,
-                               const char ctx[crypto_kdf_CONTEXTBYTES],
-                               const unsigned char key[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_derive_from_key (unsigned char *subkey, size_t subkey_len,
+                                uint64_t subkey_id,
+                                const char ctx[crypto_kdf_CONTEXTBYTES],
+                                const unsigned char key[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_kdf_keygen(unsigned char k[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_keygen (unsigned char k[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_blake2b.h
index 489c7c2..a2f287e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_blake2b.h
@@ -16,26 +16,29 @@ extern "C" {
 
 #define crypto_kdf_blake2b_BYTES_MIN 16
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_min(void);
+size_t crypto_kdf_blake2b_bytes_min (void);
 
 #define crypto_kdf_blake2b_BYTES_MAX 64
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_max(void);
+size_t crypto_kdf_blake2b_bytes_max (void);
 
 #define crypto_kdf_blake2b_CONTEXTBYTES 8
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_contextbytes(void);
+size_t crypto_kdf_blake2b_contextbytes (void);
 
 #define crypto_kdf_blake2b_KEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_keybytes(void);
+size_t crypto_kdf_blake2b_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_blake2b_derive_from_key(unsigned char *subkey, size_t 
subkey_len,
-                                       uint64_t subkey_id,
-                                       const char 
ctx[crypto_kdf_blake2b_CONTEXTBYTES],
-                                       const unsigned char 
key[crypto_kdf_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_blake2b_derive_from_key (unsigned char *subkey, size_t
+                                        subkey_len,
+                                        uint64_t subkey_id,
+                                        const char
+                                        ctx[crypto_kdf_blake2b_CONTEXTBYTES],
+                                        const unsigned char
+                                        key[crypto_kdf_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha256.h
index e7e7f4d..39ba301 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha256.h
@@ -18,54 +18,61 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha256_KEYBYTES crypto_auth_hmacsha256_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_keybytes(void);
+size_t crypto_kdf_hkdf_sha256_keybytes (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_min(void);
+size_t crypto_kdf_hkdf_sha256_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MAX (0xff * crypto_auth_hmacsha256_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_max(void);
+size_t crypto_kdf_hkdf_sha256_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(4)));
+int crypto_kdf_hkdf_sha256_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(4)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha256_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
+void crypto_kdf_hkdf_sha256_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha256_state {
-    crypto_auth_hmacsha256_state st;
+typedef struct crypto_kdf_hkdf_sha256_state
+{
+  crypto_auth_hmacsha256_state st;
 } crypto_kdf_hkdf_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_statebytes(void);
+size_t crypto_kdf_hkdf_sha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_init(crypto_kdf_hkdf_sha256_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_extract_init (crypto_kdf_hkdf_sha256_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_update(crypto_kdf_hkdf_sha256_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_update (crypto_kdf_hkdf_sha256_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_final(crypto_kdf_hkdf_sha256_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_final (crypto_kdf_hkdf_sha256_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha512.h
index 0ed205d..bfcabdb 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kdf_hkdf_sha512.h
@@ -18,55 +18,62 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha512_KEYBYTES crypto_auth_hmacsha512_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_keybytes(void);
+size_t crypto_kdf_hkdf_sha512_keybytes (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_min(void);
+size_t crypto_kdf_hkdf_sha512_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MAX (0xff * crypto_auth_hmacsha512_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_max(void);
+size_t crypto_kdf_hkdf_sha512_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha512_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_hkdf_sha512_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha512_state {
-    crypto_auth_hmacsha512_state st;
+typedef struct crypto_kdf_hkdf_sha512_state
+{
+  crypto_auth_hmacsha512_state st;
 } crypto_kdf_hkdf_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_statebytes(void);
+size_t crypto_kdf_hkdf_sha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_init(crypto_kdf_hkdf_sha512_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract_init (crypto_kdf_hkdf_sha512_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_update(crypto_kdf_hkdf_sha512_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_update (crypto_kdf_hkdf_sha512_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_final(crypto_kdf_hkdf_sha512_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_final (crypto_kdf_hkdf_sha512_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kx.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kx.h
index 347132c..2227064 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kx.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_kx.h
@@ -14,50 +14,56 @@ extern "C" {
 
 #define crypto_kx_PUBLICKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_publickeybytes(void);
+size_t crypto_kx_publickeybytes (void);
 
 #define crypto_kx_SECRETKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_secretkeybytes(void);
+size_t crypto_kx_secretkeybytes (void);
 
 #define crypto_kx_SEEDBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_seedbytes(void);
+size_t crypto_kx_seedbytes (void);
 
 #define crypto_kx_SESSIONKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_sessionkeybytes(void);
+size_t crypto_kx_sessionkeybytes (void);
 
 #define crypto_kx_PRIMITIVE "x25519blake2b"
 SODIUM_EXPORT
-const char *crypto_kx_primitive(void);
+const char *crypto_kx_primitive (void);
 
 SODIUM_EXPORT
-int crypto_kx_seed_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                           unsigned char sk[crypto_kx_SECRETKEYBYTES],
-                           const unsigned char seed[crypto_kx_SEEDBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_seed_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                            unsigned char sk[crypto_kx_SECRETKEYBYTES],
+                            const unsigned char seed[crypto_kx_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                      unsigned char sk[crypto_kx_SECRETKEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                       unsigned char sk[crypto_kx_SECRETKEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_client_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
client_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_client_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   client_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_kx_server_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
server_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_server_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   server_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth.h
index 7cd7b07..25ada13 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth.h
@@ -16,47 +16,48 @@ extern "C" {
 typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
 
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_statebytes(void);
+size_t  crypto_onetimeauth_statebytes (void);
 
 #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_bytes(void);
+size_t  crypto_onetimeauth_bytes (void);
 
 #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_keybytes(void);
+size_t  crypto_onetimeauth_keybytes (void);
 
 #define crypto_onetimeauth_PRIMITIVE "poly1305"
 SODIUM_EXPORT
-const char *crypto_onetimeauth_primitive(void);
+const char *crypto_onetimeauth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_verify(const unsigned char *h, const unsigned char *in,
-                              unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_verify (const unsigned char *h, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_init(crypto_onetimeauth_state *state,
-                            const unsigned char *key) __attribute__ 
((nonnull));
+int crypto_onetimeauth_init (crypto_onetimeauth_state *state,
+                             const unsigned char *key) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_update(crypto_onetimeauth_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_update (crypto_onetimeauth_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_final(crypto_onetimeauth_state *state,
-                             unsigned char *out) __attribute__ ((nonnull));
+int crypto_onetimeauth_final (crypto_onetimeauth_state *state,
+                              unsigned char *out) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_keygen (unsigned char k[crypto_onetimeauth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth_poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth_poly1305.h
index 1565d37..027107c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth_poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_onetimeauth_poly1305.h
@@ -16,54 +16,57 @@
 extern "C" {
 #endif
 
-typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state {
-    unsigned char opaque[256];
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+  unsigned char opaque[256];
 } crypto_onetimeauth_poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_statebytes(void);
+size_t crypto_onetimeauth_poly1305_statebytes (void);
 
 #define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_bytes(void);
+size_t crypto_onetimeauth_poly1305_bytes (void);
 
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_keybytes(void);
+size_t crypto_onetimeauth_poly1305_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305(unsigned char *out,
-                                const unsigned char *in,
-                                unsigned long long inlen,
-                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth_poly1305 (unsigned char *out,
+                                 const unsigned char *in,
+                                 unsigned long long inlen,
+                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_verify(const unsigned char *h,
-                                       const unsigned char *in,
-                                       unsigned long long inlen,
-                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_poly1305_verify (const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long inlen,
+                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
-                                     const unsigned char *key)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_init (crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state 
*state,
-                                       const unsigned char *in,
-                                       unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_poly1305_update (
+  crypto_onetimeauth_poly1305_state *state,
+  const unsigned char *in,
+  unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
-                                      unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_final (crypto_onetimeauth_poly1305_state 
*state,
+                                       unsigned char *out)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_poly1305_keygen(unsigned char 
k[crypto_onetimeauth_poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_poly1305_keygen (unsigned char
+                                         
k[crypto_onetimeauth_poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash.h
index 9683192..7e0ee9c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash.h
@@ -16,83 +16,87 @@ extern "C" {
 
 #define crypto_pwhash_ALG_ARGON2I13 crypto_pwhash_argon2i_ALG_ARGON2I13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2i13(void);
+int crypto_pwhash_alg_argon2i13 (void);
 
 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2id13(void);
+int crypto_pwhash_alg_argon2id13 (void);
 
 #define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_default(void);
+int crypto_pwhash_alg_default (void);
 
 #define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_min(void);
+size_t crypto_pwhash_bytes_min (void);
 
 #define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_max(void);
+size_t crypto_pwhash_bytes_max (void);
 
 #define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_min(void);
+size_t crypto_pwhash_passwd_min (void);
 
 #define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_max(void);
+size_t crypto_pwhash_passwd_max (void);
 
 #define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_saltbytes(void);
+size_t crypto_pwhash_saltbytes (void);
 
 #define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_strbytes(void);
+size_t crypto_pwhash_strbytes (void);
 
 #define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
-const char *crypto_pwhash_strprefix(void);
+const char *crypto_pwhash_strprefix (void);
 
 #define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_min(void);
+size_t crypto_pwhash_opslimit_min (void);
 
 #define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_max(void);
+size_t crypto_pwhash_opslimit_max (void);
 
 #define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_min(void);
+size_t crypto_pwhash_memlimit_min (void);
 
 #define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_max(void);
+size_t crypto_pwhash_memlimit_max (void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_interactive(void);
+size_t crypto_pwhash_opslimit_interactive (void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_interactive(void);
+size_t crypto_pwhash_memlimit_interactive (void);
 
 #define crypto_pwhash_OPSLIMIT_MODERATE 
crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_moderate(void);
+size_t crypto_pwhash_opslimit_moderate (void);
 
 #define crypto_pwhash_MEMLIMIT_MODERATE 
crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_moderate(void);
+size_t crypto_pwhash_memlimit_moderate (void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE 
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_sensitive(void);
+size_t crypto_pwhash_opslimit_sensitive (void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE 
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_sensitive(void);
+size_t crypto_pwhash_memlimit_sensitive (void);
 
 /*
  * With this function, do not forget to store all parameters, including the
@@ -101,11 +105,11 @@ size_t crypto_pwhash_memlimit_sensitive(void);
  * may change.
  */
 SODIUM_EXPORT
-int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
-                  const char * const passwd, unsigned long long passwdlen,
-                  const unsigned char * const salt,
-                  unsigned long long opslimit, size_t memlimit, int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash (unsigned char *const out, unsigned long long outlen,
+                   const char *const passwd, unsigned long long passwdlen,
+                   const unsigned char *const salt,
+                   unsigned long long opslimit, size_t memlimit, int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /*
  * The output string already includes all the required parameters, including
@@ -113,32 +117,35 @@ int crypto_pwhash(unsigned char * const out, unsigned 
long long outlen,
  * order to verify a password.
  */
 SODIUM_EXPORT
-int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
-                      const char * const passwd, unsigned long long passwdlen,
-                      unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str (char out[crypto_pwhash_STRBYTES],
+                       const char *const passwd, unsigned long long passwdlen,
+                       unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
-                          const char * const passwd, unsigned long long 
passwdlen,
-                          unsigned long long opslimit, size_t memlimit, int 
alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_alg (char out[crypto_pwhash_STRBYTES],
+                           const char *const passwd, unsigned long long
+                           passwdlen,
+                           unsigned long long opslimit, size_t memlimit, int
+                           alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_verify(const char *str,
-                             const char * const passwd,
-                             unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_verify (const char *str,
+                              const char *const passwd,
+                              unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_needs_rehash(const char *str,
-                                   unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_needs_rehash (const char *str,
+                                    unsigned long long opslimit, size_t
+                                    memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
-const char *crypto_pwhash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_pwhash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2i.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2i.h
index 63abdf4..65b2bc4 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2i.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2i.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2i_ALG_ARGON2I13 1
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_alg_argon2i13(void);
+int crypto_pwhash_argon2i_alg_argon2i13 (void);
 
 #define crypto_pwhash_argon2i_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_min(void);
+size_t crypto_pwhash_argon2i_bytes_min (void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                    4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_max(void);
+size_t crypto_pwhash_argon2i_bytes_max (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_min(void);
+size_t crypto_pwhash_argon2i_passwd_min (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_max(void);
+size_t crypto_pwhash_argon2i_passwd_max (void);
 
 #define crypto_pwhash_argon2i_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_saltbytes(void);
+size_t crypto_pwhash_argon2i_saltbytes (void);
 
 #define crypto_pwhash_argon2i_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_strbytes(void);
+size_t crypto_pwhash_argon2i_strbytes (void);
 
 #define crypto_pwhash_argon2i_STRPREFIX "$argon2i$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2i_strprefix(void);
+const char *crypto_pwhash_argon2i_strprefix (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MIN 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_min(void);
+size_t crypto_pwhash_argon2i_opslimit_min (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_max(void);
+size_t crypto_pwhash_argon2i_opslimit_max (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_min(void);
+size_t crypto_pwhash_argon2i_memlimit_min (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_max(void);
+size_t crypto_pwhash_argon2i_memlimit_max (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_interactive(void);
+size_t crypto_pwhash_argon2i_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_interactive(void);
+size_t crypto_pwhash_argon2i_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MODERATE 6U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_moderate(void);
+size_t crypto_pwhash_argon2i_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MODERATE 134217728U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_moderate(void);
+size_t crypto_pwhash_argon2i_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE 8U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2i_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE 536870912U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2i_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i(unsigned char * const out,
-                          unsigned long long outlen,
-                          const char * const passwd,
-                          unsigned long long passwdlen,
-                          const unsigned char * const salt,
-                          unsigned long long opslimit, size_t memlimit,
-                          int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i (unsigned char *const out,
+                           unsigned long long outlen,
+                           const char *const passwd,
+                           unsigned long long passwdlen,
+                           const unsigned char *const salt,
+                           unsigned long long opslimit, size_t memlimit,
+                           int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str(char out[crypto_pwhash_argon2i_STRBYTES],
-                              const char * const passwd,
-                              unsigned long long passwdlen,
-                              unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str (char out[crypto_pwhash_argon2i_STRBYTES],
+                               const char *const passwd,
+                               unsigned long long passwdlen,
+                               unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_verify(const char * str,
-                                     const char * const passwd,
-                                     unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_verify (const char *str,
+                                      const char *const passwd,
+                                      unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_needs_rehash(const char * str,
-                                           unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_needs_rehash (const char *str,
+                                            unsigned long long opslimit, size_t
+                                            memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2id.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2id.h
index 98bc83e..6a2194f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2id.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_argon2id.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_alg_argon2id13(void);
+int crypto_pwhash_argon2id_alg_argon2id13 (void);
 
 #define crypto_pwhash_argon2id_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_min(void);
+size_t crypto_pwhash_argon2id_bytes_min (void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                     4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_max(void);
+size_t crypto_pwhash_argon2id_bytes_max (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_min(void);
+size_t crypto_pwhash_argon2id_passwd_min (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_max(void);
+size_t crypto_pwhash_argon2id_passwd_max (void);
 
 #define crypto_pwhash_argon2id_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_saltbytes(void);
+size_t crypto_pwhash_argon2id_saltbytes (void);
 
 #define crypto_pwhash_argon2id_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_strbytes(void);
+size_t crypto_pwhash_argon2id_strbytes (void);
 
 #define crypto_pwhash_argon2id_STRPREFIX "$argon2id$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2id_strprefix(void);
+const char *crypto_pwhash_argon2id_strprefix (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MIN 1U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_min(void);
+size_t crypto_pwhash_argon2id_opslimit_min (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_max(void);
+size_t crypto_pwhash_argon2id_opslimit_max (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_min(void);
+size_t crypto_pwhash_argon2id_memlimit_min (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_max(void);
+size_t crypto_pwhash_argon2id_memlimit_max (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE 2U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_interactive(void);
+size_t crypto_pwhash_argon2id_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE 67108864U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_interactive(void);
+size_t crypto_pwhash_argon2id_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MODERATE 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_moderate(void);
+size_t crypto_pwhash_argon2id_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MODERATE 268435456U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_moderate(void);
+size_t crypto_pwhash_argon2id_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2id_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2id_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id(unsigned char * const out,
-                           unsigned long long outlen,
-                           const char * const passwd,
-                           unsigned long long passwdlen,
-                           const unsigned char * const salt,
-                           unsigned long long opslimit, size_t memlimit,
-                           int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id (unsigned char *const out,
+                            unsigned long long outlen,
+                            const char *const passwd,
+                            unsigned long long passwdlen,
+                            const unsigned char *const salt,
+                            unsigned long long opslimit, size_t memlimit,
+                            int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str(char out[crypto_pwhash_argon2id_STRBYTES],
-                               const char * const passwd,
-                               unsigned long long passwdlen,
-                               unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str (char out[crypto_pwhash_argon2id_STRBYTES],
+                                const char *const passwd,
+                                unsigned long long passwdlen,
+                                unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_verify(const char * str,
-                                      const char * const passwd,
-                                      unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_verify (const char *str,
+                                       const char *const passwd,
+                                       unsigned long long passwdlen)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_needs_rehash(const char * str,
-                                            unsigned long long opslimit, 
size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_needs_rehash (const char *str,
+                                             unsigned long long opslimit, 
size_t
+                                             memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
index 8956dfb..ed33309 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
@@ -16,102 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
+  SODIUM_MIN (SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_saltbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_strbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$"
 SODIUM_EXPORT
-const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void);
+const char *crypto_pwhash_scryptsalsa208sha256_strprefix (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MIN 32768U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MIN 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
-    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
+  SODIUM_MIN (SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256(unsigned char * const out,
-                                       unsigned long long outlen,
-                                       const char * const passwd,
-                                       unsigned long long passwdlen,
-                                       const unsigned char * const salt,
-                                       unsigned long long opslimit,
-                                       size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256 (unsigned char *const out,
+                                        unsigned long long outlen,
+                                        const char *const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char *const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str(char 
out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
-                                           const char * const passwd,
-                                           unsigned long long passwdlen,
-                                           unsigned long long opslimit,
-                                           size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str (char
+                                            out[
+                                              
crypto_pwhash_scryptsalsa208sha256_STRBYTES
+                                            ],
+                                            const char *const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_verify(const char * str,
-                                                  const char * const passwd,
-                                                  unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_verify (const char *str,
+                                                   const char *const passwd,
+                                                   unsigned long long 
passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t 
passwdlen,
-                                          const uint8_t * salt, size_t saltlen,
-                                          uint64_t N, uint32_t r, uint32_t p,
-                                          uint8_t * buf, size_t buflen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_ll (const uint8_t *passwd, size_t
+                                           passwdlen,
+                                           const uint8_t *salt, size_t saltlen,
+                                           uint64_t N, uint32_t r, uint32_t p,
+                                           uint8_t *buf, size_t buflen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char * str,
-                                                        unsigned long long 
opslimit,
-                                                        size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash (const char *str,
+                                                         unsigned long long
+                                                         opslimit,
+                                                         size_t memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult.h
index 1c68585..15586d3 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult.h
@@ -12,19 +12,19 @@ extern "C" {
 
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_bytes(void);
+size_t  crypto_scalarmult_bytes (void);
 
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_scalarbytes(void);
+size_t  crypto_scalarmult_scalarbytes (void);
 
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 SODIUM_EXPORT
-const char *crypto_scalarmult_primitive(void);
+const char *crypto_scalarmult_primitive (void);
 
 SODIUM_EXPORT
-int crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -35,9 +35,9 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned 
char *n)
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult(unsigned char *q, const unsigned char *n,
-                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult (unsigned char *q, const unsigned char *n,
+                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_curve25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_curve25519.h
index 60e9d0c..9cde57c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_curve25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_curve25519.h
@@ -11,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_curve25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_bytes(void);
+size_t crypto_scalarmult_curve25519_bytes (void);
 
 #define crypto_scalarmult_curve25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_scalarbytes(void);
+size_t crypto_scalarmult_curve25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -26,14 +26,14 @@ size_t crypto_scalarmult_curve25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
-                                 const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519 (unsigned char *q, const unsigned char *n,
+                                  const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519_base(unsigned char *q,
-                                      const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519_base (unsigned char *q,
+                                       const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ed25519.h
index 2dfa4d7..749c0c1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ed25519.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ed25519_H
 #define crypto_scalarmult_ed25519_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ed25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_bytes(void);
+size_t crypto_scalarmult_ed25519_bytes (void);
 
 #define crypto_scalarmult_ed25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_scalarbytes(void);
+size_t crypto_scalarmult_ed25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,22 +26,23 @@ size_t crypto_scalarmult_ed25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519(unsigned char *q, const unsigned char *n,
-                              const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519 (unsigned char *q, const unsigned char *n,
+                               const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_noclamp(unsigned char *q, const unsigned char *n,
-                                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_noclamp (unsigned char *q, const unsigned char 
*n,
+                                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base_noclamp(unsigned char *q, const unsigned 
char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base_noclamp (unsigned char *q, const unsigned
+                                            char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ristretto255.h
index 40a45cc..b1840a1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_scalarmult_ristretto255.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ristretto255_H
 #define crypto_scalarmult_ristretto255_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ristretto255_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_bytes(void);
+size_t crypto_scalarmult_ristretto255_bytes (void);
 
 #define crypto_scalarmult_ristretto255_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_scalarbytes(void);
+size_t crypto_scalarmult_ristretto255_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,14 +26,14 @@ size_t crypto_scalarmult_ristretto255_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255(unsigned char *q, const unsigned char *n,
-                                   const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255 (unsigned char *q, const unsigned char *n,
+                                    const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255_base(unsigned char *q,
-                                        const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255_base (unsigned char *q,
+                                         const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox.h
index 1d3709d..c764617 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox.h
@@ -15,76 +15,80 @@ extern "C" {
 
 #define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_keybytes(void);
+size_t  crypto_secretbox_keybytes (void);
 
 #define crypto_secretbox_NONCEBYTES 
crypto_secretbox_xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_noncebytes(void);
+size_t  crypto_secretbox_noncebytes (void);
 
 #define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_macbytes(void);
+size_t  crypto_secretbox_macbytes (void);
 
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_secretbox_primitive(void);
+const char *crypto_secretbox_primitive (void);
 
-#define crypto_secretbox_MESSAGEBYTES_MAX 
crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_secretbox_MESSAGEBYTES_MAX \
+  crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t crypto_secretbox_messagebytes_max(void);
+size_t crypto_secretbox_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
-                          unsigned long long mlen, const unsigned char *n,
-                          const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_secretbox_easy (unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k) __attribute__ ((nonnull(1, 
4,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
-                               unsigned long long clen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open_easy (unsigned char *m, const unsigned char *c,
+                                unsigned long long clen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
-                              const unsigned char *m,
-                              unsigned long long mlen,
-                              const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_detached (unsigned char *c, unsigned char *mac,
+                               const unsigned char *m,
+                               unsigned long long mlen,
+                               const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_detached(unsigned char *m,
-                                   const unsigned char *c,
-                                   const unsigned char *mac,
-                                   unsigned long long clen,
-                                   const unsigned char *n,
-                                   const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_open_detached (unsigned char *m,
+                                    const unsigned char *c,
+                                    const unsigned char *mac,
+                                    unsigned long long clen,
+                                    const unsigned char *n,
+                                    const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 SODIUM_EXPORT
-void crypto_secretbox_keygen(unsigned char k[crypto_secretbox_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_keygen (unsigned char k[crypto_secretbox_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_zerobytes(void);
+size_t  crypto_secretbox_zerobytes (void);
 
-#define crypto_secretbox_BOXZEROBYTES 
crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+#define crypto_secretbox_BOXZEROBYTES \
+  crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_boxzerobytes(void);
+size_t  crypto_secretbox_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_secretbox(unsigned char *c, const unsigned char *m,
-                     unsigned long long mlen, const unsigned char *n,
-                     const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_secretbox (unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                      5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
-                          unsigned long long clen, const unsigned char *n,
-                          const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open (unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xchacha20poly1305.h
index 6ec674e..509fac9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xchacha20poly1305.h
@@ -14,54 +14,55 @@ extern "C" {
 
 #define crypto_secretbox_xchacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_keybytes(void);
+size_t crypto_secretbox_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
+size_t crypto_secretbox_xchacha20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
+size_t crypto_secretbox_xchacha20poly1305_macbytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_secretbox_xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xchacha20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
-                                            const unsigned char *m,
-                                            unsigned long long mlen,
-                                            const unsigned char *n,
-                                            const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xchacha20poly1305_easy (unsigned char *c,
+                                             const unsigned char *m,
+                                             unsigned long long mlen,
+                                             const unsigned char *n,
+                                             const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_easy(unsigned char *m,
-                                                 const unsigned char *c,
-                                                 unsigned long long clen,
-                                                 const unsigned char *n,
-                                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xchacha20poly1305_open_easy (unsigned char *m,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
-                                                unsigned char *mac,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_xchacha20poly1305_detached (unsigned char *c,
+                                                 unsigned char *mac,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     const unsigned char *mac,
-                                                     unsigned long long clen,
-                                                     const unsigned char *n,
-                                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_xchacha20poly1305_open_detached (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      const unsigned char *mac,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index be0874c..18c9bfc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -14,53 +14,57 @@ extern "C" {
 
 #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_keybytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
-                                      const unsigned char *m,
-                                      unsigned long long mlen,
-                                      const unsigned char *n,
-                                      const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xsalsa20poly1305 (unsigned char *c,
+                                       const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n,
+                                       const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
-                                           const unsigned char *c,
-                                           unsigned long long clen,
-                                           const unsigned char *n,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xsalsa20poly1305_open (unsigned char *m,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *n,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char 
k[crypto_secretbox_xsalsa20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_xsalsa20poly1305_keygen (unsigned char
+                                               k[
+                                                 
crypto_secretbox_xsalsa20poly1305_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretstream_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretstream_xchacha20poly1305.h
index b22e4e9..6b8b135 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretstream_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_secretstream_xchacha20poly1305.h
@@ -15,91 +15,100 @@ extern "C" {
 #endif
 
 #define crypto_secretstream_xchacha20poly1305_ABYTES \
-    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+size_t crypto_secretstream_xchacha20poly1305_abytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
-    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+size_t crypto_secretstream_xchacha20poly1305_headerbytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_KEYBYTES \
-    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+size_t crypto_secretstream_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, 
\
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
               (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
-    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
-     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+  (crypto_secretstream_xchacha20poly1305_TAG_PUSH   \
+   | crypto_secretstream_xchacha20poly1305_TAG_REKEY)
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final (void);
 
-typedef struct crypto_secretstream_xchacha20poly1305_state {
-    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
-    unsigned char _pad[8];
+typedef struct crypto_secretstream_xchacha20poly1305_state
+{
+  unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+  unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+  unsigned char _pad[8];
 } crypto_secretstream_xchacha20poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+size_t crypto_secretstream_xchacha20poly1305_statebytes (void);
 
 SODIUM_EXPORT
 void crypto_secretstream_xchacha20poly1305_keygen
-   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
 int crypto_secretstream_xchacha20poly1305_init_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (crypto_secretstream_xchacha20poly1305_state * state,
+  unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *c, unsigned long long *clen_p,
-    const unsigned char *m, unsigned long long mlen,
-    const unsigned char *ad, unsigned long long adlen, unsigned char tag)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_push (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *c, unsigned long
+  long *clen_p,
+  const unsigned char *m, unsigned
+  long long mlen,
+  const unsigned char *ad,
+  unsigned long long adlen, unsigned char tag)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_init_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    const unsigned char 
header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_secretstream_xchacha20poly1305_init_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  const unsigned char
+  header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char
+  k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
-    const unsigned char *c, unsigned long long clen,
-    const unsigned char *ad, unsigned long long adlen)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *m, unsigned long
+  long *mlen_p, unsigned char *tag_p,
+  const unsigned char *c, unsigned
+  long long clen,
+  const unsigned char *ad,
+  unsigned long long adlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_secretstream_xchacha20poly1305_rekey
-    (crypto_secretstream_xchacha20poly1305_state *state);
+void crypto_secretstream_xchacha20poly1305_rekey (
+  crypto_secretstream_xchacha20poly1305_state *state);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash.h
index fecaa88..399538d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash.h
@@ -15,24 +15,24 @@ extern "C" {
 
 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_bytes(void);
+size_t  crypto_shorthash_bytes (void);
 
 #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_keybytes(void);
+size_t  crypto_shorthash_keybytes (void);
 
 #define crypto_shorthash_PRIMITIVE "siphash24"
 SODIUM_EXPORT
-const char *crypto_shorthash_primitive(void);
+const char *crypto_shorthash_primitive (void);
 
 SODIUM_EXPORT
-int crypto_shorthash(unsigned char *out, const unsigned char *in,
-                     unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash (unsigned char *out, const unsigned char *in,
+                      unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_shorthash_keygen (unsigned char k[crypto_shorthash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash_siphash24.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash_siphash24.h
index 1e6f72a..f179919 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash_siphash24.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_shorthash_siphash24.h
@@ -15,32 +15,35 @@ extern "C" {
 
 #define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_bytes(void);
+size_t crypto_shorthash_siphash24_bytes (void);
 
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_keybytes(void);
+size_t crypto_shorthash_siphash24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
-                               unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphash24 (unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned
+                                char *k)
+__attribute__ ((nonnull(1, 4)));
 
 #ifndef SODIUM_LIBRARY_MINIMAL
 /* -- 128-bit output -- */
 
 #define crypto_shorthash_siphashx24_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_bytes(void);
+size_t crypto_shorthash_siphashx24_bytes (void);
 
 #define crypto_shorthash_siphashx24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_keybytes(void);
+size_t crypto_shorthash_siphashx24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphashx24(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphashx24 (unsigned char *out, const unsigned char *in,
+                                 unsigned long long inlen, const unsigned
+                                 char *k)
+__attribute__ ((nonnull(1, 4)));
+
 #endif
 
 #ifdef __cplusplus
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign.h
index f5fafb1..9879476 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign.h
@@ -23,82 +23,84 @@ extern "C" {
 typedef crypto_sign_ed25519ph_state crypto_sign_state;
 
 SODIUM_EXPORT
-size_t  crypto_sign_statebytes(void);
+size_t  crypto_sign_statebytes (void);
 
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_sign_bytes(void);
+size_t  crypto_sign_bytes (void);
 
 #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_seedbytes(void);
+size_t  crypto_sign_seedbytes (void);
 
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_publickeybytes(void);
+size_t  crypto_sign_publickeybytes (void);
 
 #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_secretkeybytes(void);
+size_t  crypto_sign_secretkeybytes (void);
 
 #define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_sign_messagebytes_max(void);
+size_t  crypto_sign_messagebytes_max (void);
 
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
-const char *crypto_sign_primitive(void);
+const char *crypto_sign_primitive (void);
 
 SODIUM_EXPORT
-int crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                             const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_seed_keypair (unsigned char *pk, unsigned char *sk,
+                              const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-                const unsigned char *m, unsigned long long mlen,
-                const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
+int crypto_sign (unsigned char *sm, unsigned long long *smlen_p,
+                 const unsigned char *m, unsigned long long mlen,
+                 const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                     const unsigned char *sm, unsigned long long smlen,
-                     const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+int crypto_sign_open (unsigned char *m, unsigned long long *mlen_p,
+                      const unsigned char *sm, unsigned long long smlen,
+                      const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                         const unsigned char *m, unsigned long long mlen,
-                         const unsigned char *sk) __attribute__ ((nonnull(1, 
5)));
+int crypto_sign_detached (unsigned char *sig, unsigned long long *siglen_p,
+                          const unsigned char *m, unsigned long long mlen,
+                          const unsigned char *sk) __attribute__ ((nonnull(1,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_sign_verify_detached(const unsigned char *sig,
-                                const unsigned char *m,
-                                unsigned long long mlen,
-                                const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_verify_detached (const unsigned char *sig,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_init(crypto_sign_state *state);
+int crypto_sign_init (crypto_sign_state *state);
 
 SODIUM_EXPORT
-int crypto_sign_update(crypto_sign_state *state,
-                       const unsigned char *m, unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_update (crypto_sign_state *state,
+                        const unsigned char *m, unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                             unsigned long long *siglen_p,
-                             const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_final_create (crypto_sign_state *state, unsigned char *sig,
+                              unsigned long long *siglen_p,
+                              const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_final_verify(crypto_sign_state *state, const unsigned char 
*sig,
-                             const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_final_verify (crypto_sign_state *state, const unsigned
+                              char *sig,
+                              const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_ed25519.h
index 0fdac42..ba08826 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_ed25519.h
@@ -12,110 +12,112 @@
 extern "C" {
 #endif
 
-typedef struct crypto_sign_ed25519ph_state {
-    crypto_hash_sha512_state hs;
+typedef struct crypto_sign_ed25519ph_state
+{
+  crypto_hash_sha512_state hs;
 } crypto_sign_ed25519ph_state;
 
 SODIUM_EXPORT
-size_t crypto_sign_ed25519ph_statebytes(void);
+size_t crypto_sign_ed25519ph_statebytes (void);
 
 #define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_bytes(void);
+size_t crypto_sign_ed25519_bytes (void);
 
 #define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_seedbytes(void);
+size_t crypto_sign_ed25519_seedbytes (void);
 
 #define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_publickeybytes(void);
+size_t crypto_sign_ed25519_publickeybytes (void);
 
 #define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_secretkeybytes(void);
+size_t crypto_sign_ed25519_secretkeybytes (void);
 
-#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - 
crypto_sign_ed25519_BYTES)
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                              - crypto_sign_ed25519_BYTES)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_messagebytes_max(void);
+size_t crypto_sign_ed25519_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *sk)
-            __attribute__ ((nonnull(1, 5)));
+int crypto_sign_ed25519 (unsigned char *sm, unsigned long long *smlen_p,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+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)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((nonnull(1, 5)));
+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)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_ed25519_verify_detached (const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                     const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_seed_keypair (unsigned char *pk, unsigned char *sk,
+                                      const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                         const unsigned char *ed25519_pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519_pk_to_curve25519 (unsigned char *curve25519_pk,
+                                          const unsigned char *ed25519_pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                         const unsigned char *ed25519_sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_curve25519 (unsigned char *curve25519_sk,
+                                          const unsigned char *ed25519_sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_seed(unsigned char *seed,
-                                   const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_seed (unsigned char *seed,
+                                    const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_pk (unsigned char *pk, const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_init (crypto_sign_ed25519ph_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                                 const unsigned char *m,
-                                 unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_ed25519ph_update (crypto_sign_ed25519ph_state *state,
+                                  const unsigned char *m,
+                                  unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                       unsigned char *sig,
-                                       unsigned long long *siglen_p,
-                                       const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_ed25519ph_final_create (crypto_sign_ed25519ph_state *state,
+                                        unsigned char *sig,
+                                        unsigned long long *siglen_p,
+                                        const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                       const unsigned char *sig,
-                                       const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_final_verify (crypto_sign_ed25519ph_state *state,
+                                        const unsigned char *sig,
+                                        const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_edwards25519sha512batch.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_edwards25519sha512batch.h
index eed158a..bcfba7b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -25,28 +25,30 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
-#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX 
- crypto_sign_edwards25519sha512batch_BYTES)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                                              - \
+                                                              
crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *sm,
-                                        unsigned long long *smlen_p,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
+int crypto_sign_edwards25519sha512batch (unsigned char *sm,
+                                         unsigned long long *smlen_p,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
+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)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                                unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_sign_edwards25519sha512batch_keypair (unsigned char *pk,
+                                                 unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream.h
index 88dab5f..c8efcdc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream.h
@@ -23,34 +23,34 @@ extern "C" {
 
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_keybytes(void);
+size_t  crypto_stream_keybytes (void);
 
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_noncebytes(void);
+size_t  crypto_stream_noncebytes (void);
 
 #define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_stream_messagebytes_max(void);
+size_t  crypto_stream_messagebytes_max (void);
 
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
-const char *crypto_stream_primitive(void);
+const char *crypto_stream_primitive (void);
 
 SODIUM_EXPORT
-int crypto_stream(unsigned char *c, unsigned long long clen,
-                  const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream (unsigned char *c, unsigned long long clen,
+                   const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xor(unsigned char *c, const unsigned char *m,
-                      unsigned long long mlen, const unsigned char *n,
-                      const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xor (unsigned char *c, const unsigned char *m,
+                       unsigned long long mlen, const unsigned char *n,
+                       const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_keygen (unsigned char k[crypto_stream_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_chacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_chacha20.h
index 4088975..e276a7d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_chacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_chacha20.h
@@ -22,82 +22,89 @@ extern "C" {
 
 #define crypto_stream_chacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_keybytes(void);
+size_t crypto_stream_chacha20_keybytes (void);
 
 #define crypto_stream_chacha20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_noncebytes(void);
+size_t crypto_stream_chacha20_noncebytes (void);
 
 #define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_messagebytes_max(void);
+size_t crypto_stream_chacha20_messagebytes_max (void);
 
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
-int crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_keygen(unsigned char 
k[crypto_stream_chacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_keygen (unsigned char
+                                    k[crypto_stream_chacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
 
 #define crypto_stream_chacha20_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_keybytes(void);
+size_t crypto_stream_chacha20_ietf_keybytes (void);
 
 #define crypto_stream_chacha20_ietf_NONCEBYTES 12U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_noncebytes(void);
+size_t crypto_stream_chacha20_ietf_noncebytes (void);
 
 #define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+  SODIUM_MIN (SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+size_t crypto_stream_chacha20_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf (unsigned char *c, unsigned long long clen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
-                                    unsigned long long mlen, const unsigned 
char *n,
-                                    const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor (unsigned char *c, const unsigned char *m,
+                                     unsigned long long mlen, const unsigned
+                                     char *n,
+                                     const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char 
*m,
-                                       unsigned long long mlen,
-                                       const unsigned char *n, uint32_t ic,
-                                       const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor_ic (unsigned char *c, const unsigned
+                                        char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *n, uint32_t ic,
+                                        const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_ietf_keygen(unsigned char 
k[crypto_stream_chacha20_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_ietf_keygen (unsigned char
+                                         
k[crypto_stream_chacha20_ietf_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_stream_chacha20_IETF_KEYBYTES 
crypto_stream_chacha20_ietf_KEYBYTES
-#define crypto_stream_chacha20_IETF_NONCEBYTES 
crypto_stream_chacha20_ietf_NONCEBYTES
-#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX 
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+#define crypto_stream_chacha20_IETF_KEYBYTES \
+  crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES \
+  crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX \
+  crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa20.h
index 45b3b3e..e677477 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_keybytes(void);
+size_t crypto_stream_salsa20_keybytes (void);
 
 #define crypto_stream_salsa20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_noncebytes(void);
+size_t crypto_stream_salsa20_noncebytes (void);
 
 #define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_messagebytes_max(void);
+size_t crypto_stream_salsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
-                          const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20 (unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
-                              unsigned long long mlen, const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor (unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                 unsigned long long mlen,
-                                 const unsigned char *n, uint64_t ic,
-                                 const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa20_keygen(unsigned char 
k[crypto_stream_salsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa20_keygen (unsigned char
+                                   k[crypto_stream_salsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa2012.h
index 6c5d303..66545d1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa2012.h
@@ -21,30 +21,32 @@ extern "C" {
 
 #define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_keybytes(void);
+size_t crypto_stream_salsa2012_keybytes (void);
 
 #define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_noncebytes(void);
+size_t crypto_stream_salsa2012_noncebytes (void);
 
 #define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_messagebytes_max(void);
+size_t crypto_stream_salsa2012_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa2012_keygen(unsigned char 
k[crypto_stream_salsa2012_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa2012_keygen (unsigned char
+                                     k[crypto_stream_salsa2012_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa208.h
index d574f30..00ee015 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_salsa208.h
@@ -21,33 +21,34 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_noncebytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
-    SODIUM_EXPORT
-size_t crypto_stream_salsa208_messagebytes_max(void)
-            __attribute__ ((deprecated));
+SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char 
k[crypto_stream_salsa208_KEYBYTES])
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+void crypto_stream_salsa208_keygen (unsigned char
+                                    k[crypto_stream_salsa208_KEYBYTES])
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xchacha20.h
index c4002db..a42ba70 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xchacha20.h
@@ -22,37 +22,39 @@ extern "C" {
 
 #define crypto_stream_xchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_keybytes(void);
+size_t crypto_stream_xchacha20_keybytes (void);
 
 #define crypto_stream_xchacha20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_noncebytes(void);
+size_t crypto_stream_xchacha20_noncebytes (void);
 
 #define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_messagebytes_max(void);
+size_t crypto_stream_xchacha20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                   unsigned long long mlen,
-                                   const unsigned char *n, uint64_t ic,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen,
+                                    const unsigned char *n, uint64_t ic,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xchacha20_keygen(unsigned char 
k[crypto_stream_xchacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xchacha20_keygen (unsigned char
+                                     k[crypto_stream_xchacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xsalsa20.h
index 20034e3..60b0233 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_stream_xsalsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_keybytes(void);
+size_t crypto_stream_xsalsa20_keybytes (void);
 
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_noncebytes(void);
+size_t crypto_stream_xsalsa20_noncebytes (void);
 
 #define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_messagebytes_max(void);
+size_t crypto_stream_xsalsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xsalsa20_keygen(unsigned char 
k[crypto_stream_xsalsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xsalsa20_keygen (unsigned char
+                                    k[crypto_stream_xsalsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_16.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_16.h
index 7b9c807..ec377fd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_16.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_16.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_verify_16_bytes(void);
+size_t crypto_verify_16_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_16 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_32.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_32.h
index 9b0f452..03fa394 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_32.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_32.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_verify_32_bytes(void);
+size_t crypto_verify_32_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_32 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_64.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_64.h
index c83b730..fe18a74 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_64.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/crypto_verify_64.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_64_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_verify_64_bytes(void);
+size_t crypto_verify_64_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_64 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/export.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/export.h
index a0074fc..d943e3e 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/export.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/export.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_export_H
 #define sodium_export_H
 
@@ -6,7 +5,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if ! defined(__clang__) && ! defined(__GNUC__)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
@@ -26,7 +25,7 @@
 # else
 #  if defined(__SUNPRO_C)
 #   ifndef __GNU_C__
-#    define SODIUM_EXPORT __attribute__ (visibility(__global))
+#    define SODIUM_EXPORT __attribute__ (visibility (__global))
 #   else
 #    define SODIUM_EXPORT __attribute__ __global
 #   endif
@@ -36,7 +35,7 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
-# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+# if defined(__ELF__) && ! defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
 # else
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
@@ -45,13 +44,13 @@
 
 #ifndef CRYPTO_ALIGN
 # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
-#  define CRYPTO_ALIGN(x) __declspec(align(x))
+#  define CRYPTO_ALIGN(x) __declspec(align (x))
 # else
-#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned (x)))
 # endif
 #endif
 
 #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#define SODIUM_SIZE_MAX SODIUM_MIN (UINT64_MAX, SIZE_MAX)
 
 #endif
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes.h
index c83a4df..3539ac8 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_H
 #define randombytes_H
 
@@ -16,54 +15,56 @@
 extern "C" {
 #endif
 
-typedef struct randombytes_implementation {
-    const char *(*implementation_name)(void); /* required */
-    uint32_t    (*random)(void);              /* required */
-    void        (*stir)(void);                /* optional */
-    uint32_t    (*uniform)(const uint32_t upper_bound); /* optional, a default 
implementation will be used if NULL */
-    void        (*buf)(void * const buf, const size_t size); /* required */
-    int         (*close)(void);               /* optional */
+typedef struct randombytes_implementation
+{
+  const char *(*implementation_name)(void);   /* required */
+  uint32_t (*random)(void);                   /* required */
+  void (*stir)(void);                         /* optional */
+  uint32_t (*uniform)(const uint32_t upper_bound);      /* optional, a default 
implementation will be used if NULL */
+  void (*buf)(void *const buf, const size_t size);           /* required */
+  int (*close)(void);                         /* optional */
 } randombytes_implementation;
 
-#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+#define randombytes_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, 0xffffffffUL)
 
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t randombytes_seedbytes(void);
+size_t randombytes_seedbytes (void);
 
 SODIUM_EXPORT
-void randombytes_buf(void * const buf, const size_t size)
-            __attribute__ ((nonnull));
+void randombytes_buf (void *const buf, const size_t size)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void randombytes_buf_deterministic(void * const buf, const size_t size,
-                                   const unsigned char 
seed[randombytes_SEEDBYTES])
-            __attribute__ ((nonnull));
+void randombytes_buf_deterministic (void *const buf, const size_t size,
+                                    const unsigned char
+                                    seed[randombytes_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-uint32_t randombytes_random(void);
+uint32_t randombytes_random (void);
 
 SODIUM_EXPORT
-uint32_t randombytes_uniform(const uint32_t upper_bound);
+uint32_t randombytes_uniform (const uint32_t upper_bound);
 
 SODIUM_EXPORT
-void randombytes_stir(void);
+void randombytes_stir (void);
 
 SODIUM_EXPORT
-int randombytes_close(void);
+int randombytes_close (void);
 
 SODIUM_EXPORT
-int randombytes_set_implementation(const randombytes_implementation *impl)
-            __attribute__ ((nonnull));
+int randombytes_set_implementation (const randombytes_implementation *impl)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-const char *randombytes_implementation_name(void);
+const char *randombytes_implementation_name (void);
 
 /* -- NaCl compatibility interface -- */
 
 SODIUM_EXPORT
-void randombytes(unsigned char * const buf, const unsigned long long buf_len)
-            __attribute__ ((nonnull));
+void randombytes (unsigned char *const buf, const unsigned long long buf_len)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_internal_random.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_internal_random.h
index 2b2b7d6..d9cd6b0 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_internal_random.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_internal_random.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_internal_random_H
 #define randombytes_internal_random_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_sysrandom.h
 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_sysrandom.h
index 9e27b67..ebb284f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_sysrandom.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/randombytes_sysrandom.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_sysrandom_H
 #define randombytes_sysrandom_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/runtime.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/runtime.h
index c1cec85..471d71b 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/runtime.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/runtime.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_runtime_H
 #define sodium_runtime_H
 
@@ -9,44 +8,44 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_neon(void);
+int sodium_runtime_has_neon (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_armcrypto(void);
+int sodium_runtime_has_armcrypto (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse2(void);
+int sodium_runtime_has_sse2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse3(void);
+int sodium_runtime_has_sse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_ssse3(void);
+int sodium_runtime_has_ssse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse41(void);
+int sodium_runtime_has_sse41 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx(void);
+int sodium_runtime_has_avx (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx2(void);
+int sodium_runtime_has_avx2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx512f(void);
+int sodium_runtime_has_avx512f (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_pclmul(void);
+int sodium_runtime_has_pclmul (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_aesni(void);
+int sodium_runtime_has_aesni (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_rdrand(void);
+int sodium_runtime_has_rdrand (void);
 
 /* ------------------------------------------------------------------------- */
 
-int _sodium_runtime_get_cpu_features(void);
+int _sodium_runtime_get_cpu_features (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/utils.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/utils.h
index f9b3697..39b121d 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/utils.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/utils.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_utils_H
 #define sodium_utils_H
 
@@ -11,7 +10,8 @@ extern "C" {
 #endif
 
 #ifndef SODIUM_C99
-# if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 
199901L
+# if defined(__cplusplus) || ! defined(__STDC_VERSION__) || __STDC_VERSION__ < 
\
+  199901L
 #  define SODIUM_C99(X)
 # else
 #  define SODIUM_C99(X) X
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-void sodium_memzero(void * const pnt, const size_t len);
+void sodium_memzero (void *const pnt, const size_t len);
 
 SODIUM_EXPORT
-void sodium_stackzero(const size_t len);
+void sodium_stackzero (const size_t len);
 
 /*
  * WARNING: sodium_memcmp() must be used to verify if two secret keys
@@ -31,8 +31,8 @@ void sodium_stackzero(const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
-            __attribute__ ((warn_unused_result));
+int sodium_memcmp (const void *const b1_, const void *const b2_, size_t len)
+__attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -41,32 +41,32 @@ int sodium_memcmp(const void * const b1_, const void * 
const b2_, size_t len)
  * However, it is slower than sodium_memcmp().
  */
 SODIUM_EXPORT
-int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len) __attribute__ ((warn_unused_result));
+int sodium_compare (const unsigned char *b1_, const unsigned char *b2_,
+                    size_t len) __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int sodium_is_zero(const unsigned char *n, const size_t nlen);
+int sodium_is_zero (const unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_increment(unsigned char *n, const size_t nlen);
+void sodium_increment (unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_add(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_add (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-void sodium_sub(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_sub (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,
-                     const unsigned char * const bin, const size_t bin_len)
-            __attribute__ ((nonnull(1)));
+char *sodium_bin2hex (char *const hex, const size_t hex_maxlen,
+                      const unsigned char *const bin, const size_t bin_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
-                   const char * const hex, const size_t hex_len,
-                   const char * const ignore, size_t * const bin_len,
-                   const char ** const hex_end)
-            __attribute__ ((nonnull(1)));
+int sodium_hex2bin (unsigned char *const bin, const size_t bin_maxlen,
+                    const char *const hex, const size_t hex_len,
+                    const char *const ignore, size_t *const bin_len,
+                    const char **const hex_end)
+__attribute__ ((nonnull(1)));
 
 #define sodium_base64_VARIANT_ORIGINAL            1
 #define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
@@ -78,32 +78,35 @@ int sodium_hex2bin(unsigned char * const bin, const size_t 
bin_maxlen,
  * using the given variant. The computed length includes a trailing \0.
  */
 #define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT) \
-    (((BIN_LEN) / 3U) * 4U + \
-    ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 
3U) >> 1)) & 1U) * \
-     (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) - ((BIN_LEN) / 
3U) * 3U)))) + 1U)
+  (((BIN_LEN) / 3U) * 4U   \
+   + ((((BIN_LEN) -((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) -((BIN_LEN) / 3U) \
+                                              * 3U) >> 1)) & 1U)   \
+   * (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) -((BIN_LEN) \
+                                                                 / 3U) \
+                                                     * 3U)))) + 1U)
 
 SODIUM_EXPORT
-size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+size_t sodium_base64_encoded_len (const size_t bin_len, const int variant);
 
 SODIUM_EXPORT
-char *sodium_bin2base64(char * const b64, const size_t b64_maxlen,
-                        const unsigned char * const bin, const size_t bin_len,
-                        const int variant) __attribute__ ((nonnull(1)));
+char *sodium_bin2base64 (char *const b64, const size_t b64_maxlen,
+                         const unsigned char *const bin, const size_t bin_len,
+                         const int variant) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_base642bin(unsigned char * const bin, const size_t bin_maxlen,
-                      const char * const b64, const size_t b64_len,
-                      const char * const ignore, size_t * const bin_len,
-                      const char ** const b64_end, const int variant)
-            __attribute__ ((nonnull(1)));
+int sodium_base642bin (unsigned char *const bin, const size_t bin_maxlen,
+                       const char *const b64, const size_t b64_len,
+                       const char *const ignore, size_t *const bin_len,
+                       const char **const b64_end, const int variant)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_mlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_mlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_munlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_munlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 /* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
  * allocation functions.
@@ -139,38 +142,38 @@ int sodium_munlock(void * const addr, const size_t len)
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size)
-            __attribute__ ((malloc));
+void *sodium_malloc (const size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size)
-            __attribute__ ((malloc));
+void *sodium_allocarray (size_t count, size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void sodium_free(void *ptr);
+void sodium_free (void *ptr);
 
 SODIUM_EXPORT
-int sodium_mprotect_noaccess(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_noaccess (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readonly(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readonly (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readwrite(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readwrite (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
-               size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
-            __attribute__ ((nonnull(2)));
+int sodium_pad (size_t *padded_buflen_p, unsigned char *buf,
+                size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+__attribute__ ((nonnull(2)));
 
 SODIUM_EXPORT
-int sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
-                 size_t padded_buflen, size_t blocksize)
-            __attribute__ ((nonnull(2)));
+int sodium_unpad (size_t *unpadded_buflen_p, const unsigned char *buf,
+                  size_t padded_buflen, size_t blocksize)
+__attribute__ ((nonnull(2)));
 
 /* -------- */
 
-int _sodium_alloc_init(void);
+int _sodium_alloc_init (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/version.h 
b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/version.h
index 022ab11..cec1b92 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/version.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86/include/sodium/version.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_version_H
 #define sodium_version_H
 
@@ -15,16 +14,16 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-const char *sodium_version_string(void);
+const char *sodium_version_string (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_major(void);
+int         sodium_library_version_major (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_minor(void);
+int         sodium_library_version_minor (void);
 
 SODIUM_EXPORT
-int         sodium_library_minimal(void);
+int         sodium_library_minimal (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium.h
index 86b7a4d..f11f028 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_H
 #define sodium_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/core.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/core.h
index dd088d2..921c7e6 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/core.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/core.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_core_H
 #define sodium_core_H
 
@@ -9,17 +8,17 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int sodium_init(void)
-            __attribute__ ((warn_unused_result));
+int sodium_init (void)
+__attribute__ ((warn_unused_result));
 
 /* ---- */
 
 SODIUM_EXPORT
-int sodium_set_misuse_handler(void (*handler)(void));
+int sodium_set_misuse_handler (void (*handler)(void));
 
 SODIUM_EXPORT
-void sodium_misuse(void)
-            __attribute__ ((noreturn));
+void sodium_misuse (void)
+__attribute__ ((noreturn));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis128l.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis128l.h
index 0ad019f..ba8a2c6 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis128l.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis128l.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis128l_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_keybytes(void);
+size_t crypto_aead_aegis128l_keybytes (void);
 
 #define crypto_aead_aegis128l_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_nsecbytes(void);
+size_t crypto_aead_aegis128l_nsecbytes (void);
 
 #define crypto_aead_aegis128l_NPUBBYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_npubbytes(void);
+size_t crypto_aead_aegis128l_npubbytes (void);
 
 #define crypto_aead_aegis128l_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_abytes(void);
+size_t crypto_aead_aegis128l_abytes (void);
 
 #define crypto_aead_aegis128l_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 
1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis128l_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis128l_messagebytes_max(void);
+size_t crypto_aead_aegis128l_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt(unsigned char       *c,
-                                  unsigned long long  *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long   mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis128l_encrypt (unsigned char       *c,
+                                   unsigned long long  *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt(unsigned char       *m,
-                                  unsigned long long  *mlen_p,
-                                  unsigned char       *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long   clen,
-                                  const unsigned char *ad,
-                                  unsigned long long   adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis128l_decrypt (unsigned char       *m,
+                                   unsigned long long  *mlen_p,
+                                   unsigned char       *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_encrypt_detached(unsigned char       *c,
-                                           unsigned char       *mac,
-                                           unsigned long long  *maclen_p,
-                                           const unsigned char *m,
-                                           unsigned long long   mlen,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *nsec,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis128l_encrypt_detached (unsigned char       *c,
+                                            unsigned char       *mac,
+                                            unsigned long long  *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis128l_decrypt_detached(unsigned char       *m,
-                                           unsigned char       *nsec,
-                                           const unsigned char *c,
-                                           unsigned long long   clen,
-                                           const unsigned char *mac,
-                                           const unsigned char *ad,
-                                           unsigned long long   adlen,
-                                           const unsigned char *npub,
-                                           const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis128l_decrypt_detached (unsigned char       *m,
+                                            unsigned char       *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis128l_keygen(unsigned char 
k[crypto_aead_aegis128l_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis128l_keygen (unsigned char
+                                   k[crypto_aead_aegis128l_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis256.h
index 26bd18a..6b3feff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aegis256.h
@@ -14,76 +14,79 @@ extern "C" {
 
 #define crypto_aead_aegis256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_keybytes(void);
+size_t crypto_aead_aegis256_keybytes (void);
 
 #define crypto_aead_aegis256_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_nsecbytes(void);
+size_t crypto_aead_aegis256_nsecbytes (void);
 
 #define crypto_aead_aegis256_NPUBBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_npubbytes(void);
+size_t crypto_aead_aegis256_npubbytes (void);
 
 #define crypto_aead_aegis256_ABYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_abytes(void);
+size_t crypto_aead_aegis256_abytes (void);
 
 #define crypto_aead_aegis256_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aegis256_ABYTES, (1ULL << 61) - 1)
 SODIUM_EXPORT
-size_t crypto_aead_aegis256_messagebytes_max(void);
+size_t crypto_aead_aegis256_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt(unsigned char       *c,
-                                 unsigned long long  *clen_p,
-                                 const unsigned char *m,
-                                 unsigned long long   mlen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *nsec,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((nonnull(1, 8, 9)));
+int crypto_aead_aegis256_encrypt (unsigned char       *c,
+                                  unsigned long long  *clen_p,
+                                  const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *nsec,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt(unsigned char       *m,
-                                 unsigned long long  *mlen_p,
-                                 unsigned char       *nsec,
-                                 const unsigned char *c,
-                                 unsigned long long   clen,
-                                 const unsigned char *ad,
-                                 unsigned long long   adlen,
-                                 const unsigned char *npub,
-                                 const unsigned char *k) 
__attribute__((warn_unused_result))
+int crypto_aead_aegis256_decrypt (unsigned char       *m,
+                                  unsigned long long  *mlen_p,
+                                  unsigned char       *nsec,
+                                  const unsigned char *c,
+                                  unsigned long long clen,
+                                  const unsigned char *ad,
+                                  unsigned long long adlen,
+                                  const unsigned char *npub,
+                                  const unsigned char *k) __attribute__(
+  (warn_unused_result))
 __attribute__((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_encrypt_detached(unsigned char       *c,
-                                          unsigned char       *mac,
-                                          unsigned long long  *maclen_p,
-                                          const unsigned char *m,
-                                          unsigned long long   mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((nonnull(1, 2, 9, 10)));
+int crypto_aead_aegis256_encrypt_detached (unsigned char       *c,
+                                           unsigned char       *mac,
+                                           unsigned long long  *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_aegis256_decrypt_detached(unsigned char       *m,
-                                          unsigned char       *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long   clen,
-                                          const unsigned char *mac,
-                                          const unsigned char *ad,
-                                          unsigned long long   adlen,
-                                          const unsigned char *npub,
-                                          const unsigned char *k)
-    __attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
+int crypto_aead_aegis256_decrypt_detached (unsigned char       *m,
+                                           unsigned char       *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+__attribute__((warn_unused_result)) __attribute__((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_aegis256_keygen(unsigned char 
k[crypto_aead_aegis256_KEYBYTES])
-    __attribute__((nonnull));
+void crypto_aead_aegis256_keygen (unsigned char
+                                  k[crypto_aead_aegis256_KEYBYTES])
+__attribute__((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aes256gcm.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aes256gcm.h
index 9baeb3f..5d259ff 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aes256gcm.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_aes256gcm.h
@@ -32,145 +32,154 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_is_available(void);
+int crypto_aead_aes256gcm_is_available (void);
 
 #define crypto_aead_aes256gcm_KEYBYTES  32U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_keybytes(void);
+size_t crypto_aead_aes256gcm_keybytes (void);
 
 #define crypto_aead_aes256gcm_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_nsecbytes(void);
+size_t crypto_aead_aes256gcm_nsecbytes (void);
 
 #define crypto_aead_aes256gcm_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_npubbytes(void);
+size_t crypto_aead_aes256gcm_npubbytes (void);
 
 #define crypto_aead_aes256gcm_ABYTES    16U
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_abytes(void);
+size_t crypto_aead_aes256gcm_abytes (void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)))
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
+              (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_messagebytes_max(void);
+size_t crypto_aead_aes256gcm_messagebytes_max (void);
 
-typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_ {
-    unsigned char opaque[512];
+typedef struct CRYPTO_ALIGN(16) crypto_aead_aes256gcm_state_
+{
+  unsigned char opaque[512];
 } crypto_aead_aes256gcm_state;
 
 SODIUM_EXPORT
-size_t crypto_aead_aes256gcm_statebytes(void);
+size_t crypto_aead_aes256gcm_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt(unsigned char *c,
-                                  unsigned long long *clen_p,
-                                  const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *nsec,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_aes256gcm_encrypt (unsigned char *c,
+                                   unsigned long long *clen_p,
+                                   const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *nsec,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt (unsigned char *m,
+                                   unsigned long long *mlen_p,
+                                   unsigned char *nsec,
+                                   const unsigned char *c,
+                                   unsigned long long clen,
+                                   const unsigned char *ad,
+                                   unsigned long long adlen,
+                                   const unsigned char *npub,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached (unsigned char *c,
+                                            unsigned char *mac,
+                                            unsigned long long *maclen_p,
+                                            const unsigned char *m,
+                                            unsigned long long mlen,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *nsec,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached (unsigned char *m,
+                                            unsigned char *nsec,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *mac,
+                                            const unsigned char *ad,
+                                            unsigned long long adlen,
+                                            const unsigned char *npub,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+/* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt(unsigned char *m,
-                                  unsigned long long *mlen_p,
-                                  unsigned char *nsec,
-                                  const unsigned char *c,
-                                  unsigned long long clen,
-                                  const unsigned char *ad,
-                                  unsigned long long adlen,
-                                  const unsigned char *npub,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_aes256gcm_beforenm (crypto_aead_aes256gcm_state *ctx_,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
-                                           unsigned char *mac,
-                                           unsigned long long *maclen_p,
+int crypto_aead_aes256gcm_encrypt_afternm (unsigned char *c,
+                                           unsigned long long *clen_p,
                                            const unsigned char *m,
                                            unsigned long long mlen,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *nsec,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+int crypto_aead_aes256gcm_decrypt_afternm (unsigned char *m,
+                                           unsigned long long *mlen_p,
                                            unsigned char *nsec,
                                            const unsigned char *c,
                                            unsigned long long clen,
-                                           const unsigned char *mac,
                                            const unsigned char *ad,
                                            unsigned long long adlen,
                                            const unsigned char *npub,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-/* -- Precomputation interface -- */
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_afternm(unsigned char *c,
-                                          unsigned long long *clen_p,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *nsec,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
-                                          unsigned long long *mlen_p,
-                                          unsigned char *nsec,
-                                          const unsigned char *c,
-                                          unsigned long long clen,
-                                          const unsigned char *ad,
-                                          unsigned long long adlen,
-                                          const unsigned char *npub,
-                                          const crypto_aead_aes256gcm_state 
*ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
-                                                   unsigned char *mac,
-                                                   unsigned long long 
*maclen_p,
-                                                   const unsigned char *m,
-                                                   unsigned long long mlen,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *nsec,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
-                                                   unsigned char *nsec,
-                                                   const unsigned char *c,
-                                                   unsigned long long clen,
-                                                   const unsigned char *mac,
-                                                   const unsigned char *ad,
-                                                   unsigned long long adlen,
-                                                   const unsigned char *npub,
-                                                   const 
crypto_aead_aes256gcm_state *ctx_)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_aes256gcm_keygen(unsigned char 
k[crypto_aead_aes256gcm_KEYBYTES])
-            __attribute__ ((nonnull));
+                                           const crypto_aead_aes256gcm_state *
+                                           ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm (unsigned char *c,
+                                                    unsigned char *mac,
+                                                    unsigned long
+                                                    long *maclen_p,
+                                                    const unsigned char *m,
+                                                    unsigned long long mlen,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *nsec,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm (unsigned char *m,
+                                                    unsigned char *nsec,
+                                                    const unsigned char *c,
+                                                    unsigned long long clen,
+                                                    const unsigned char *mac,
+                                                    const unsigned char *ad,
+                                                    unsigned long long adlen,
+                                                    const unsigned char *npub,
+                                                    const
+                                                    crypto_aead_aes256gcm_state
+                                                    *ctx_)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_aes256gcm_keygen (unsigned char
+                                   k[crypto_aead_aes256gcm_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_chacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_chacha20poly1305.h
index 5d671df..686f5aa 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_chacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_chacha20poly1305.h
@@ -15,163 +15,181 @@ extern "C" {
 
 #define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
 
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_chacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * ((1ULL << 32) - 1ULL)))
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                       unsigned char *mac,
-                                                       unsigned long long 
*maclen_p,
-                                                       const unsigned char *m,
-                                                       unsigned long long mlen,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*nsec,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                       unsigned char *nsec,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char 
*mac,
-                                                       const unsigned char *ad,
-                                                       unsigned long long 
adlen,
-                                                       const unsigned char 
*npub,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+              (64ULL * ((1ULL << 32) - 1ULL)))
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt (unsigned char *c,
+                                               unsigned long long *clen_p,
+                                               const unsigned char *m,
+                                               unsigned long long mlen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *nsec,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt (unsigned char *m,
+                                               unsigned long long *mlen_p,
+                                               unsigned char *nsec,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *ad,
+                                               unsigned long long adlen,
+                                               const unsigned char *npub,
+                                               const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                        unsigned char *mac,
+                                                        unsigned long
+                                                        long *maclen_p,
+                                                        const unsigned char *m,
+                                                        unsigned long long 
mlen,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *nsec,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                        unsigned char *nsec,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned
+                                                        char *mac,
+                                                        const unsigned char 
*ad,
+                                                        unsigned long long
+                                                        adlen,
+                                                        const unsigned
+                                                        char *npub,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_ietf_keygen (unsigned char
+                                               k[
+                                                 
crypto_aead_chacha20poly1305_ietf_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit 
internal counter -- */
 
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_keybytes(void);
+size_t crypto_aead_chacha20poly1305_keybytes (void);
 
 #define crypto_aead_chacha20poly1305_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_nsecbytes(void);
+size_t crypto_aead_chacha20poly1305_nsecbytes (void);
 
 #define crypto_aead_chacha20poly1305_NPUBBYTES 8U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_npubbytes(void);
+size_t crypto_aead_chacha20poly1305_npubbytes (void);
 
 #define crypto_aead_chacha20poly1305_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_abytes(void);
+size_t crypto_aead_chacha20poly1305_abytes (void);
 
 #define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
-SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
-                                         unsigned long long *clen_p,
-                                         const unsigned char *m,
-                                         unsigned long long mlen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *nsec,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
-                                         unsigned long long *mlen_p,
-                                         unsigned char *nsec,
-                                         const unsigned char *c,
-                                         unsigned long long clen,
-                                         const unsigned char *ad,
-                                         unsigned long long adlen,
-                                         const unsigned char *npub,
-                                         const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
-                                                  unsigned char *mac,
-                                                  unsigned long long *maclen_p,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *nsec,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
-
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
-                                                  unsigned char *nsec,
-                                                  const unsigned char *c,
-                                                  unsigned long long clen,
-                                                  const unsigned char *mac,
-                                                  const unsigned char *ad,
-                                                  unsigned long long adlen,
-                                                  const unsigned char *npub,
-                                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
-
-SODIUM_EXPORT
-void crypto_aead_chacha20poly1305_keygen(unsigned char 
k[crypto_aead_chacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max (void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt (unsigned char *c,
+                                          unsigned long long *clen_p,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *nsec,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt (unsigned char *m,
+                                          unsigned long long *mlen_p,
+                                          unsigned char *nsec,
+                                          const unsigned char *c,
+                                          unsigned long long clen,
+                                          const unsigned char *ad,
+                                          unsigned long long adlen,
+                                          const unsigned char *npub,
+                                          const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_encrypt_detached (unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long 
*maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_decrypt_detached (unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
+
+SODIUM_EXPORT
+void crypto_aead_chacha20poly1305_keygen (unsigned char
+                                          k[
+                                            
crypto_aead_chacha20poly1305_KEYBYTES
+                                          ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         
crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        
crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        
crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES           
crypto_aead_chacha20poly1305_ietf_ABYTES
-#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           \
+  crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_xchacha20poly1305.h
index 6643b0c..6bdd39f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_aead_xchacha20poly1305.h
@@ -13,85 +13,104 @@ extern "C" {
 
 #define crypto_aead_xchacha20poly1305_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_keybytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_keybytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NSECBYTES 0U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_nsecbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_NPUBBYTES 24U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_npubbytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_ABYTES 16U
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
+size_t crypto_aead_xchacha20poly1305_ietf_abytes (void);
 
 #define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
-    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
-                                               unsigned long long *clen_p,
-                                               const unsigned char *m,
-                                               unsigned long long mlen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *nsec,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((nonnull(1, 8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt (unsigned char *c,
+                                                unsigned long long *clen_p,
+                                                const unsigned char *m,
+                                                unsigned long long mlen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *nsec,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((nonnull(1, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt(unsigned char *m,
-                                               unsigned long long *mlen_p,
-                                               unsigned char *nsec,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *ad,
-                                               unsigned long long adlen,
-                                               const unsigned char *npub,
-                                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 
9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt (unsigned char *m,
+                                                unsigned long long *mlen_p,
+                                                unsigned char *nsec,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *ad,
+                                                unsigned long long adlen,
+                                                const unsigned char *npub,
+                                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(4, 8, 9)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_encrypt_detached(unsigned char *c,
-                                                        unsigned char *mac,
-                                                        unsigned long long 
*maclen_p,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*nsec,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 9, 10)));
+int crypto_aead_xchacha20poly1305_ietf_encrypt_detached (unsigned char *c,
+                                                         unsigned char *mac,
+                                                         unsigned long
+                                                         long *maclen_p,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *nsec,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 9, 10)));
 
 SODIUM_EXPORT
-int crypto_aead_xchacha20poly1305_ietf_decrypt_detached(unsigned char *m,
-                                                        unsigned char *nsec,
-                                                        const unsigned char *c,
-                                                        unsigned long long 
clen,
-                                                        const unsigned char 
*mac,
-                                                        const unsigned char 
*ad,
-                                                        unsigned long long 
adlen,
-                                                        const unsigned char 
*npub,
-                                                        const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 
8, 9)));
+int crypto_aead_xchacha20poly1305_ietf_decrypt_detached (unsigned char *m,
+                                                         unsigned char *nsec,
+                                                         const unsigned char 
*c,
+                                                         unsigned long long
+                                                         clen,
+                                                         const unsigned
+                                                         char *mac,
+                                                         const unsigned
+                                                         char *ad,
+                                                         unsigned long long
+                                                         adlen,
+                                                         const unsigned
+                                                         char *npub,
+                                                         const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5, 8, 9)));
 
 SODIUM_EXPORT
-void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char 
k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_aead_xchacha20poly1305_ietf_keygen (unsigned char
+                                                k[
+                                                  
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+                                                ])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        
crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        
crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES           
crypto_aead_xchacha20poly1305_ietf_ABYTES
-#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX 
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         \
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        \
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           \
+  crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX \
+  crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth.h
index 540aee0..ef7e5d9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth.h
@@ -15,29 +15,29 @@ extern "C" {
 
 #define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
 SODIUM_EXPORT
-size_t  crypto_auth_bytes(void);
+size_t  crypto_auth_bytes (void);
 
 #define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_auth_keybytes(void);
+size_t  crypto_auth_keybytes (void);
 
 #define crypto_auth_PRIMITIVE "hmacsha512256"
 SODIUM_EXPORT
-const char *crypto_auth_primitive(void);
+const char *crypto_auth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_auth(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_auth (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_verify (const unsigned char *h, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_auth_keygen(unsigned char k[crypto_auth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_keygen (unsigned char k[crypto_auth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha256.h
index 3da864c..925d0cc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha256.h
@@ -14,54 +14,57 @@ extern "C" {
 
 #define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_bytes(void);
+size_t crypto_auth_hmacsha256_bytes (void);
 
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_keybytes(void);
+size_t crypto_auth_hmacsha256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha256_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha256_state {
-    crypto_hash_sha256_state ictx;
-    crypto_hash_sha256_state octx;
+typedef struct crypto_auth_hmacsha256_state
+{
+  crypto_hash_sha256_state ictx;
+  crypto_hash_sha256_state octx;
 } crypto_auth_hmacsha256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha256_statebytes(void);
+size_t crypto_auth_hmacsha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_init (crypto_auth_hmacsha256_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_auth_hmacsha256_update (crypto_auth_hmacsha256_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha256_final (crypto_auth_hmacsha256_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha256_keygen(unsigned char 
k[crypto_auth_hmacsha256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha256_keygen (unsigned char
+                                    k[crypto_auth_hmacsha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512.h
index d992cb8..e5fd3ca 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512.h
@@ -14,52 +14,56 @@ extern "C" {
 
 #define crypto_auth_hmacsha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_bytes(void);
+size_t crypto_auth_hmacsha512_bytes (void);
 
 #define crypto_auth_hmacsha512_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_keybytes(void);
+size_t crypto_auth_hmacsha512_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512(unsigned char *out,
-                           const unsigned char *in,
-                           unsigned long long inlen,
-                           const unsigned char *k) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512 (unsigned char *out,
+                            const unsigned char *in,
+                            unsigned long long inlen,
+                            const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                            
4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_verify(const unsigned char *h,
-                                  const unsigned char *in,
-                                  unsigned long long inlen,
-                                  const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512_verify (const unsigned char *h,
+                                   const unsigned char *in,
+                                   unsigned long long inlen,
+                                   const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_auth_hmacsha512_state {
-    crypto_hash_sha512_state ictx;
-    crypto_hash_sha512_state octx;
+typedef struct crypto_auth_hmacsha512_state
+{
+  crypto_hash_sha512_state ictx;
+  crypto_hash_sha512_state octx;
 } crypto_auth_hmacsha512_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512_statebytes(void);
+size_t crypto_auth_hmacsha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
-                                const unsigned char *key,
-                                size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_init (crypto_auth_hmacsha512_state *state,
+                                 const unsigned char *key,
+                                 size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
-                                  const unsigned char *in,
-                                  unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512_update (crypto_auth_hmacsha512_state *state,
+                                   const unsigned char *in,
+                                   unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
-                                 unsigned char *out) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512_final (crypto_auth_hmacsha512_state *state,
+                                  unsigned char *out) __attribute__ 
((nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512_keygen(unsigned char 
k[crypto_auth_hmacsha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512_keygen (unsigned char
+                                    k[crypto_auth_hmacsha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512256.h
index 3fb5263..25a0787 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_auth_hmacsha512256.h
@@ -14,49 +14,53 @@ extern "C" {
 
 #define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_bytes(void);
+size_t crypto_auth_hmacsha512256_bytes (void);
 
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_keybytes(void);
+size_t crypto_auth_hmacsha512256_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *out,
-                              const unsigned char *in,
-                              unsigned long long inlen,
-                              const unsigned char *k) __attribute__ 
((nonnull(1, 4)));
+int crypto_auth_hmacsha512256 (unsigned char *out,
+                               const unsigned char *in,
+                               unsigned long long inlen,
+                               const unsigned char *k) __attribute__ (
+  (nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *h,
-                                     const unsigned char *in,
-                                     unsigned long long inlen,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_auth_hmacsha512256_verify (const unsigned char *h,
+                                      const unsigned char *in,
+                                      unsigned long long inlen,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 /* ------------------------------------------------------------------------- */
 
 typedef crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
 
 SODIUM_EXPORT
-size_t crypto_auth_hmacsha512256_statebytes(void);
+size_t crypto_auth_hmacsha512256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
-                                   const unsigned char *key,
-                                   size_t keylen) __attribute__ ((nonnull));
+int crypto_auth_hmacsha512256_init (crypto_auth_hmacsha512256_state *state,
+                                    const unsigned char *key,
+                                    size_t keylen) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
-                                     const unsigned char *in,
-                                     unsigned long long inlen) __attribute__ 
((nonnull(1)));
+int crypto_auth_hmacsha512256_update (crypto_auth_hmacsha512256_state *state,
+                                      const unsigned char *in,
+                                      unsigned long long inlen) __attribute__ (
+  (nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
-                                    unsigned char *out) __attribute__ 
((nonnull));
+int crypto_auth_hmacsha512256_final (crypto_auth_hmacsha512256_state *state,
+                                     unsigned char *out) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_auth_hmacsha512256_keygen(unsigned char 
k[crypto_auth_hmacsha512256_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_auth_hmacsha512256_keygen (unsigned char
+                                       k[crypto_auth_hmacsha512256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box.h
index e060dd2..41190bd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box.h
@@ -22,153 +22,164 @@ extern "C" {
 
 #define crypto_box_SEEDBYTES crypto_box_curve25519xsalsa20poly1305_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_box_seedbytes(void);
+size_t  crypto_box_seedbytes (void);
 
-#define crypto_box_PUBLICKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_PUBLICKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_publickeybytes(void);
+size_t  crypto_box_publickeybytes (void);
 
-#define crypto_box_SECRETKEYBYTES 
crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_SECRETKEYBYTES \
+  crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_box_secretkeybytes(void);
+size_t  crypto_box_secretkeybytes (void);
 
 #define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_box_noncebytes(void);
+size_t  crypto_box_noncebytes (void);
 
 #define crypto_box_MACBYTES crypto_box_curve25519xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_box_macbytes(void);
+size_t  crypto_box_macbytes (void);
 
-#define crypto_box_MESSAGEBYTES_MAX 
crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_box_MESSAGEBYTES_MAX \
+  crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_box_messagebytes_max(void);
+size_t  crypto_box_messagebytes_max (void);
 
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_box_primitive(void);
+const char *crypto_box_primitive (void);
 
 SODIUM_EXPORT
-int crypto_box_seed_keypair(unsigned char *pk, unsigned char *sk,
-                            const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_box_seed_keypair (unsigned char *pk, unsigned char *sk,
+                             const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_easy (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen, const unsigned char *n,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open_easy (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen, const unsigned char *n,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_detached(unsigned char *c, unsigned char *mac,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
+int crypto_box_detached (unsigned char *c, unsigned char *mac,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *n, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
-                             const unsigned char *mac,
-                             unsigned long long clen,
-                             const unsigned char *n,
-                             const unsigned char *pk,
-                             const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+int crypto_box_open_detached (unsigned char *m, const unsigned char *c,
+                              const unsigned char *mac,
+                              unsigned long long clen,
+                              const unsigned char *n,
+                              const unsigned char *pk,
+                              const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
-#define crypto_box_BEFORENMBYTES 
crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_BEFORENMBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
 SODIUM_EXPORT
-size_t  crypto_box_beforenmbytes(void);
+size_t  crypto_box_beforenmbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_beforenm (unsigned char *k, const unsigned char *pk,
+                         const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
-                            unsigned long long mlen, const unsigned char *n,
-                            const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_box_easy_afternm (unsigned char *c, const unsigned char *m,
+                             unsigned long long mlen, const unsigned char *n,
+                             const unsigned char *k) __attribute__ ((nonnull(1,
+                                                                             4,
+                                                                             
5)));
 
 SODIUM_EXPORT
-int crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
-                                 unsigned long long clen, const unsigned char 
*n,
-                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_easy_afternm (unsigned char *m, const unsigned char *c,
+                                  unsigned long long clen, const unsigned
+                                  char *n,
+                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
-                                const unsigned char *m, unsigned long long 
mlen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_detached_afternm (unsigned char *c, unsigned char *mac,
+                                 const unsigned char *m, unsigned long long
+                                 mlen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
-                                     const unsigned char *mac,
-                                     unsigned long long clen, const unsigned 
char *n,
-                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_open_detached_afternm (unsigned char *m, const unsigned char *c,
+                                      const unsigned char *mac,
+                                      unsigned long long clen, const unsigned
+                                      char *n,
+                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_SEALBYTES (crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_sealbytes(void);
+size_t crypto_box_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_seal(unsigned char *c, const unsigned char *m,
-                    unsigned long long mlen, const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_seal (unsigned char *c, const unsigned char *m,
+                     unsigned long long mlen, const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_seal_open(unsigned char *m, const unsigned char *c,
-                         unsigned long long clen,
-                         const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_seal_open (unsigned char *m, const unsigned char *c,
+                          unsigned long long clen,
+                          const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_zerobytes(void);
+size_t  crypto_box_zerobytes (void);
 
-#define crypto_box_BOXZEROBYTES 
crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_BOXZEROBYTES \
+  crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_box_boxzerobytes(void);
+size_t  crypto_box_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box(unsigned char *c, const unsigned char *m,
-               unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box (unsigned char *c, const unsigned char *m,
+                unsigned long long mlen, const unsigned char *n,
+                const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_open(unsigned char *m, const unsigned char *c,
-                    unsigned long long clen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_open (unsigned char *m, const unsigned char *c,
+                     unsigned long long clen, const unsigned char *n,
+                     const unsigned char *pk, const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_afternm(unsigned char *c, const unsigned char *m,
-                       unsigned long long mlen, const unsigned char *n,
-                       const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_box_afternm (unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                        5)));
 
 SODIUM_EXPORT
-int crypto_box_open_afternm(unsigned char *m, const unsigned char *c,
-                            unsigned long long clen, const unsigned char *n,
-                            const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_open_afternm (unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xchacha20poly1305.h
index 26a3d31..092da6d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xchacha20poly1305.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_box_curve25519xchacha20poly1305_H
 #define crypto_box_curve25519xchacha20poly1305_H
 
@@ -15,147 +14,170 @@ extern "C" {
 
 #define crypto_box_curve25519xchacha20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_macbytes (void);
 
 #define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max (void);
+
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+int crypto_box_curve25519xchacha20poly1305_seed_keypair (unsigned char *pk,
+                                                         unsigned char *sk,
+                                                         const unsigned
+                                                         char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
-                                                        unsigned char *sk,
-                                                        const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_keypair (unsigned char *pk,
+                                                    unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk,
-                                                   unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xchacha20poly1305_easy (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *pk,
+                                                 const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *pk,
-                                                const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_open_easy (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
+int crypto_box_curve25519xchacha20poly1305_detached (unsigned char *c,
+                                                     unsigned char *mac,
+                                                     const unsigned char *m,
+                                                     unsigned long long mlen,
                                                      const unsigned char *n,
                                                      const unsigned char *pk,
                                                      const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c,
-                                                    unsigned char *mac,
-                                                    const unsigned char *m,
-                                                    unsigned long long mlen,
-                                                    const unsigned char *n,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 
5, 6, 7)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m,
-                                                         const unsigned char 
*c,
-                                                         const unsigned char 
*mac,
-                                                         unsigned long long 
clen,
-                                                         const unsigned char 
*n,
-                                                         const unsigned char 
*pk,
-                                                         const unsigned char 
*sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6, 7)));
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 2, 5, 6, 7)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached (unsigned char *m,
+                                                          const unsigned
+                                                          char *c,
+                                                          const unsigned
+                                                          char *mac,
+                                                          unsigned long long
+                                                          clen,
+                                                          const unsigned
+                                                          char *n,
+                                                          const unsigned
+                                                          char *pk,
+                                                          const unsigned
+                                                          char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6, 7)));
 
 /* -- Precomputation interface -- */
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k,
-                                                    const unsigned char *pk,
-                                                    const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c,
-                                                        const unsigned char *m,
-                                                        unsigned long long 
mlen,
-                                                        const unsigned char *n,
-                                                        const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m,
-                                                             const unsigned 
char *c,
-                                                             unsigned long 
long clen,
-                                                             const unsigned 
char *n,
-                                                             const unsigned 
char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
-
-SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c,
-                                                            unsigned char *mac,
-                                                            const unsigned 
char *m,
-                                                            unsigned long long 
mlen,
-                                                            const unsigned 
char *n,
-                                                            const unsigned 
char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_box_curve25519xchacha20poly1305_beforenm (unsigned char *k,
+                                                     const unsigned char *pk,
+                                                     const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char 
*m,
-                                                                 const 
unsigned char *c,
-                                                                 const 
unsigned char *mac,
-                                                                 unsigned long 
long clen,
-                                                                 const 
unsigned char *n,
-                                                                 const 
unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_box_curve25519xchacha20poly1305_easy_afternm (unsigned char *c,
+                                                         const unsigned char 
*m,
+                                                         unsigned long long
+                                                         mlen,
+                                                         const unsigned char 
*n,
+                                                         const unsigned char 
*k)
+__attribute__ ((nonnull(1, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_easy_afternm (unsigned char *m,
+                                                              const unsigned
+                                                              char *c,
+                                                              unsigned long 
long
+                                                              clen,
+                                                              const unsigned
+                                                              char *n,
+                                                              const unsigned
+                                                              char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_detached_afternm (unsigned char *c,
+                                                             unsigned char 
*mac,
+                                                             const unsigned
+                                                             char *m,
+                                                             unsigned long long
+                                                             mlen,
+                                                             const unsigned
+                                                             char *n,
+                                                             const unsigned
+                                                             char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
+
+SODIUM_EXPORT
+int crypto_box_curve25519xchacha20poly1305_open_detached_afternm (unsigned
+                                                                  char *m,
+                                                                  const 
unsigned
+                                                                  char *c,
+                                                                  const 
unsigned
+                                                                  char *mac,
+                                                                  unsigned long
+                                                                  long clen,
+                                                                  const 
unsigned
+                                                                  char *n,
+                                                                  const 
unsigned
+                                                                  char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 /* -- Ephemeral SK interface -- */
 
 #define crypto_box_curve25519xchacha20poly1305_SEALBYTES \
-    (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES + \
-     crypto_box_curve25519xchacha20poly1305_MACBYTES)
+  (crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES   \
+   + crypto_box_curve25519xchacha20poly1305_MACBYTES)
 
 SODIUM_EXPORT
-size_t crypto_box_curve25519xchacha20poly1305_sealbytes(void);
+size_t crypto_box_curve25519xchacha20poly1305_sealbytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal(unsigned char *c,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *pk)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_box_curve25519xchacha20poly1305_seal (unsigned char *c,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *pk)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xchacha20poly1305_seal_open(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     unsigned long long clen,
-                                                     const unsigned char *pk,
-                                                     const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xchacha20poly1305_seal_open (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      unsigned long long clen,
+                                                      const unsigned char *pk,
+                                                      const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
index e733f49..32e6b32 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_box_curve25519xsalsa20poly1305.h
@@ -14,96 +14,98 @@ extern "C" {
 
 #define crypto_box_curve25519xsalsa20poly1305_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_seedbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_seedbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_noncebytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char 
*seed)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair (unsigned char *pk,
+                                                        unsigned char *sk,
+                                                        const unsigned
+                                                        char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_keypair (unsigned char *pk,
+                                                   unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_box_curve25519xsalsa20poly1305_beforenm (unsigned char *k,
+                                                    const unsigned char *pk,
+                                                    const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES \
-    (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+  (crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_box_curve25519xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
+size_t crypto_box_curve25519xsalsa20poly1305_zerobytes (void);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
-                                          const unsigned char *m,
-                                          unsigned long long mlen,
-                                          const unsigned char *n,
-                                          const unsigned char *pk,
-                                          const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305 (unsigned char *c,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *n,
+                                           const unsigned char *pk,
+                                           const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
-                                               const unsigned char *c,
-                                               unsigned long long clen,
-                                               const unsigned char *n,
-                                               const unsigned char *pk,
-                                               const unsigned char *sk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5, 6)));
+int crypto_box_curve25519xsalsa20poly1305_open (unsigned char *m,
+                                                const unsigned char *c,
+                                                unsigned long long clen,
+                                                const unsigned char *n,
+                                                const unsigned char *pk,
+                                                const unsigned char *sk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
-                                                  const unsigned char *m,
-                                                  unsigned long long mlen,
-                                                  const unsigned char *n,
-                                                  const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_box_curve25519xsalsa20poly1305_afternm (unsigned char *c,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *n,
+                                                   const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
-                                                       const unsigned char *c,
-                                                       unsigned long long clen,
-                                                       const unsigned char *n,
-                                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_box_curve25519xsalsa20poly1305_open_afternm (unsigned char *m,
+                                                        const unsigned char *c,
+                                                        unsigned long long 
clen,
+                                                        const unsigned char *n,
+                                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ed25519.h
index dcc46a6..78800dc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ed25519.h
@@ -10,88 +10,92 @@ extern "C" {
 
 #define crypto_core_ed25519_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_bytes(void);
+size_t crypto_core_ed25519_bytes (void);
 
 #define crypto_core_ed25519_UNIFORMBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_uniformbytes(void);
+size_t crypto_core_ed25519_uniformbytes (void);
 
 #define crypto_core_ed25519_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_hashbytes(void);
+size_t crypto_core_ed25519_hashbytes (void);
 
 #define crypto_core_ed25519_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ed25519_scalarbytes(void);
+size_t crypto_core_ed25519_scalarbytes (void);
 
 #define crypto_core_ed25519_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ed25519_nonreducedscalarbytes(void);
+size_t crypto_core_ed25519_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ed25519_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_add(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_add (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_sub(unsigned char *r,
-                            const unsigned char *p, const unsigned char *q)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_sub (unsigned char *r,
+                             const unsigned char *p, const unsigned char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_from_uniform (unsigned char *p, const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h)
-            __attribute__ ((nonnull)) __attribute__ ((deprecated));
+int crypto_core_ed25519_from_hash (unsigned char *p, const unsigned char *h)
+__attribute__ ((nonnull)) __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ed25519_scalar_invert(unsigned char *recip, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ed25519_scalar_invert (unsigned char *recip, const unsigned
+                                       char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_negate(unsigned char *neg, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_negate (unsigned char *neg, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_complement(unsigned char *comp, const unsigned 
char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_complement (unsigned char *comp, const unsigned
+                                            char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_add(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_add (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_sub(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_sub (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_mul(unsigned char *z, const unsigned char *x,
-                                    const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_mul (unsigned char *z, const unsigned char *x,
+                                     const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ed25519_scalar_reduce(unsigned char *r, const unsigned char 
*s)
-            __attribute__ ((nonnull));
+void crypto_core_ed25519_scalar_reduce (unsigned char *r, const unsigned
+                                        char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hchacha20.h
index ece141b..692f833 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hchacha20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hchacha20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_outputbytes(void);
+size_t crypto_core_hchacha20_outputbytes (void);
 
 #define crypto_core_hchacha20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_inputbytes(void);
+size_t crypto_core_hchacha20_inputbytes (void);
 
 #define crypto_core_hchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_keybytes(void);
+size_t crypto_core_hchacha20_keybytes (void);
 
 #define crypto_core_hchacha20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hchacha20_constbytes(void);
+size_t crypto_core_hchacha20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hchacha20 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hsalsa20.h
index 4bf7a48..67ecdab 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_hsalsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_outputbytes(void);
+size_t crypto_core_hsalsa20_outputbytes (void);
 
 #define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_inputbytes(void);
+size_t crypto_core_hsalsa20_inputbytes (void);
 
 #define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_keybytes(void);
+size_t crypto_core_hsalsa20_keybytes (void);
 
 #define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_hsalsa20_constbytes(void);
+size_t crypto_core_hsalsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_hsalsa20 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ristretto255.h
index f2820e5..053957a 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_ristretto255.h
@@ -10,88 +10,90 @@ extern "C" {
 
 #define crypto_core_ristretto255_BYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_bytes(void);
+size_t crypto_core_ristretto255_bytes (void);
 
 #define crypto_core_ristretto255_HASHBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_hashbytes(void);
+size_t crypto_core_ristretto255_hashbytes (void);
 
 #define crypto_core_ristretto255_SCALARBYTES 32
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_scalarbytes(void);
+size_t crypto_core_ristretto255_scalarbytes (void);
 
 #define crypto_core_ristretto255_NONREDUCEDSCALARBYTES 64
 SODIUM_EXPORT
-size_t crypto_core_ristretto255_nonreducedscalarbytes(void);
+size_t crypto_core_ristretto255_nonreducedscalarbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_is_valid_point(const unsigned char *p)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_is_valid_point (const unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_add(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_add (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_sub(unsigned char *r,
-                                 const unsigned char *p, const unsigned char 
*q)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_sub (unsigned char *r,
+                                  const unsigned char *p, const unsigned
+                                  char *q)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_from_hash(unsigned char *p,
-                                       const unsigned char *r)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_from_hash (unsigned char *p,
+                                        const unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_random(unsigned char *p)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_random (unsigned char *p)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_random(unsigned char *r)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_random (unsigned char *r)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_core_ristretto255_scalar_invert(unsigned char *recip,
-                                           const unsigned char *s)
-            __attribute__ ((nonnull));
+int crypto_core_ristretto255_scalar_invert (unsigned char *recip,
+                                            const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_negate(unsigned char *neg,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_negate (unsigned char *neg,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_complement(unsigned char *comp,
-                                                const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_complement (unsigned char *comp,
+                                                 const unsigned char *s)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_add(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_add (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_sub(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_sub (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_mul(unsigned char *z,
-                                         const unsigned char *x,
-                                         const unsigned char *y)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_mul (unsigned char *z,
+                                          const unsigned char *x,
+                                          const unsigned char *y)
+__attribute__ ((nonnull));
 
 /*
  * The interval `s` is sampled from should be at least 317 bits to ensure 
almost
  * uniformity of `r` over `L`.
  */
 SODIUM_EXPORT
-void crypto_core_ristretto255_scalar_reduce(unsigned char *r,
-                                            const unsigned char *s)
-            __attribute__ ((nonnull));
+void crypto_core_ristretto255_scalar_reduce (unsigned char *r,
+                                             const unsigned char *s)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa20.h
index bd79fd9..ffea366 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa20.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_outputbytes(void);
+size_t crypto_core_salsa20_outputbytes (void);
 
 #define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_inputbytes(void);
+size_t crypto_core_salsa20_inputbytes (void);
 
 #define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_keybytes(void);
+size_t crypto_core_salsa20_keybytes (void);
 
 #define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa20_constbytes(void);
+size_t crypto_core_salsa20_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
-                        const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa20 (unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa2012.h
index 0595759..70740ac 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa2012.h
@@ -10,24 +10,24 @@ extern "C" {
 
 #define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_outputbytes(void);
+size_t crypto_core_salsa2012_outputbytes (void);
 
 #define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_inputbytes(void);
+size_t crypto_core_salsa2012_inputbytes (void);
 
 #define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_keybytes(void);
+size_t crypto_core_salsa2012_keybytes (void);
 
 #define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa2012_constbytes(void);
+size_t crypto_core_salsa2012_constbytes (void);
 
 SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
-                          const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa2012 (unsigned char *out, const unsigned char *in,
+                           const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa208.h
index d2f216a..fb91b43 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_core_salsa208.h
@@ -10,28 +10,28 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_outputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_inputbytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_core_salsa208_constbytes (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
-                         const unsigned char *k, const unsigned char *c)
-            __attribute__ ((nonnull(1, 2, 3)));
+int crypto_core_salsa208 (unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c)
+__attribute__ ((nonnull(1, 2, 3)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash.h
index d897e5d..afe7a1e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash.h
@@ -15,31 +15,31 @@ extern "C" {
 
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_min(void);
+size_t  crypto_generichash_bytes_min (void);
 
 #define crypto_generichash_BYTES_MAX crypto_generichash_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes_max(void);
+size_t  crypto_generichash_bytes_max (void);
 
 #define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
+size_t  crypto_generichash_bytes (void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_min(void);
+size_t  crypto_generichash_keybytes_min (void);
 
 #define crypto_generichash_KEYBYTES_MAX crypto_generichash_blake2b_KEYBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes_max(void);
+size_t  crypto_generichash_keybytes_max (void);
 
 #define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_keybytes (void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_generichash_primitive(void);
+const char *crypto_generichash_primitive (void);
 
 /*
  * Important when writing bindings for other programming languages:
@@ -48,34 +48,34 @@ const char *crypto_generichash_primitive(void);
 typedef crypto_generichash_blake2b_state crypto_generichash_state;
 
 SODIUM_EXPORT
-size_t  crypto_generichash_statebytes(void);
+size_t  crypto_generichash_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash(unsigned char *out, size_t outlen,
-                       const unsigned char *in, unsigned long long inlen,
-                       const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash (unsigned char *out, size_t outlen,
+                        const unsigned char *in, unsigned long long inlen,
+                        const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_init(crypto_generichash_state *state,
-                            const unsigned char *key,
-                            const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_init (crypto_generichash_state *state,
+                             const unsigned char *key,
+                             const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_update(crypto_generichash_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_update (crypto_generichash_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_final(crypto_generichash_state *state,
-                             unsigned char *out, const size_t outlen)
-            __attribute__ ((nonnull));
+int crypto_generichash_final (crypto_generichash_state *state,
+                              unsigned char *out, const size_t outlen)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_keygen (unsigned char k[crypto_generichash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash_blake2b.h
index ae3b52f..e0e4462 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_generichash_blake2b.h
@@ -22,8 +22,9 @@ extern "C" {
 # pragma pack(push, 1)
 #endif
 
-typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state {
-    unsigned char opaque[384];
+typedef struct CRYPTO_ALIGN(64) crypto_generichash_blake2b_state
+{
+  unsigned char opaque[384];
 } crypto_generichash_blake2b_state;
 
 #ifdef __IBMC__
@@ -36,84 +37,89 @@ typedef struct CRYPTO_ALIGN(64) 
crypto_generichash_blake2b_state {
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_min(void);
+size_t crypto_generichash_blake2b_bytes_min (void);
 
 #define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes_max(void);
+size_t crypto_generichash_blake2b_bytes_max (void);
 
 #define crypto_generichash_blake2b_BYTES         32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_bytes(void);
+size_t crypto_generichash_blake2b_bytes (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_min(void);
+size_t crypto_generichash_blake2b_keybytes_min (void);
 
 #define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes_max(void);
+size_t crypto_generichash_blake2b_keybytes_max (void);
 
 #define crypto_generichash_blake2b_KEYBYTES      32U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_keybytes(void);
+size_t crypto_generichash_blake2b_keybytes (void);
 
 #define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_saltbytes(void);
+size_t crypto_generichash_blake2b_saltbytes (void);
 
 #define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_personalbytes(void);
+size_t crypto_generichash_blake2b_personalbytes (void);
 
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_statebytes(void);
+size_t crypto_generichash_blake2b_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
-                               const unsigned char *in,
-                               unsigned long long inlen,
-                               const unsigned char *key, size_t keylen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b (unsigned char *out, size_t outlen,
+                                const unsigned char *in,
+                                unsigned long long inlen,
+                                const unsigned char *key, size_t keylen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
-                                             const unsigned char *in,
-                                             unsigned long long inlen,
-                                             const unsigned char *key,
-                                             size_t keylen,
-                                             const unsigned char *salt,
-                                             const unsigned char *personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_salt_personal (unsigned char *out, size_t 
outlen,
+                                              const unsigned char *in,
+                                              unsigned long long inlen,
+                                              const unsigned char *key,
+                                              size_t keylen,
+                                              const unsigned char *salt,
+                                              const unsigned char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
-                                    const unsigned char *key,
-                                    const size_t keylen, const size_t outlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init (crypto_generichash_blake2b_state *state,
+                                     const unsigned char *key,
+                                     const size_t keylen, const size_t outlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int 
crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state 
*state,
-                                                  const unsigned char *key,
-                                                  const size_t keylen, const 
size_t outlen,
-                                                  const unsigned char *salt,
-                                                  const unsigned char 
*personal)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_init_salt_personal (
+  crypto_generichash_blake2b_state *state,
+  const unsigned char *key,
+  const size_t keylen, const
+  size_t outlen,
+  const unsigned char *salt,
+  const unsigned
+  char *personal)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
-                                      const unsigned char *in,
-                                      unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_generichash_blake2b_update (crypto_generichash_blake2b_state *state,
+                                       const unsigned char *in,
+                                       unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
-                                     unsigned char *out,
-                                     const size_t outlen) __attribute__ 
((nonnull));
+int crypto_generichash_blake2b_final (crypto_generichash_blake2b_state *state,
+                                      unsigned char *out,
+                                      const size_t outlen) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-void crypto_generichash_blake2b_keygen(unsigned char 
k[crypto_generichash_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_generichash_blake2b_keygen (unsigned char
+                                        k[crypto_generichash_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash.h
index 767d548..a0ac1fe 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash.h
@@ -22,16 +22,16 @@ extern "C" {
 
 #define crypto_hash_BYTES crypto_hash_sha512_BYTES
 SODIUM_EXPORT
-size_t crypto_hash_bytes(void);
+size_t crypto_hash_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash(unsigned char *out, const unsigned char *in,
-                unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash (unsigned char *out, const unsigned char *in,
+                 unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 #define crypto_hash_PRIMITIVE "sha512"
 SODIUM_EXPORT
-const char *crypto_hash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_hash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha256.h
index c47982a..2adabae 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha256.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha256_state {
-    uint32_t state[8];
-    uint64_t count;
-    uint8_t  buf[64];
+typedef struct crypto_hash_sha256_state
+{
+  uint32_t state[8];
+  uint64_t count;
+  uint8_t buf[64];
 } crypto_hash_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha256_statebytes(void);
+size_t crypto_hash_sha256_statebytes (void);
 
 #define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_hash_sha256_bytes(void);
+size_t crypto_hash_sha256_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha256 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_init(crypto_hash_sha256_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_init (crypto_hash_sha256_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha256_update (crypto_hash_sha256_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha256_final (crypto_hash_sha256_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha512.h
index 5b690fb..b9618a7 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_hash_sha512.h
@@ -21,37 +21,38 @@
 extern "C" {
 #endif
 
-typedef struct crypto_hash_sha512_state {
-    uint64_t state[8];
-    uint64_t count[2];
-    uint8_t  buf[128];
+typedef struct crypto_hash_sha512_state
+{
+  uint64_t state[8];
+  uint64_t count[2];
+  uint8_t buf[128];
 } crypto_hash_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_hash_sha512_statebytes(void);
+size_t crypto_hash_sha512_statebytes (void);
 
 #define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_hash_sha512_bytes(void);
+size_t crypto_hash_sha512_bytes (void);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen) __attribute__ ((nonnull(1)));
+int crypto_hash_sha512 (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_init(crypto_hash_sha512_state *state)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_init (crypto_hash_sha512_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_hash_sha512_update (crypto_hash_sha512_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
-                             unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_hash_sha512_final (crypto_hash_sha512_state *state,
+                              unsigned char *out)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf.h
index ac2fc61..f083146 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf.h
@@ -16,35 +16,35 @@ extern "C" {
 
 #define crypto_kdf_BYTES_MIN crypto_kdf_blake2b_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_min(void);
+size_t crypto_kdf_bytes_min (void);
 
 #define crypto_kdf_BYTES_MAX crypto_kdf_blake2b_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_kdf_bytes_max(void);
+size_t crypto_kdf_bytes_max (void);
 
 #define crypto_kdf_CONTEXTBYTES crypto_kdf_blake2b_CONTEXTBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_contextbytes(void);
+size_t crypto_kdf_contextbytes (void);
 
 #define crypto_kdf_KEYBYTES crypto_kdf_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_kdf_keybytes(void);
+size_t crypto_kdf_keybytes (void);
 
 #define crypto_kdf_PRIMITIVE "blake2b"
 SODIUM_EXPORT
-const char *crypto_kdf_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_kdf_primitive (void)
+__attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int crypto_kdf_derive_from_key(unsigned char *subkey, size_t subkey_len,
-                               uint64_t subkey_id,
-                               const char ctx[crypto_kdf_CONTEXTBYTES],
-                               const unsigned char key[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_derive_from_key (unsigned char *subkey, size_t subkey_len,
+                                uint64_t subkey_id,
+                                const char ctx[crypto_kdf_CONTEXTBYTES],
+                                const unsigned char key[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_kdf_keygen(unsigned char k[crypto_kdf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_keygen (unsigned char k[crypto_kdf_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_blake2b.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_blake2b.h
index 489c7c2..a2f287e 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_blake2b.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_blake2b.h
@@ -16,26 +16,29 @@ extern "C" {
 
 #define crypto_kdf_blake2b_BYTES_MIN 16
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_min(void);
+size_t crypto_kdf_blake2b_bytes_min (void);
 
 #define crypto_kdf_blake2b_BYTES_MAX 64
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_bytes_max(void);
+size_t crypto_kdf_blake2b_bytes_max (void);
 
 #define crypto_kdf_blake2b_CONTEXTBYTES 8
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_contextbytes(void);
+size_t crypto_kdf_blake2b_contextbytes (void);
 
 #define crypto_kdf_blake2b_KEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kdf_blake2b_keybytes(void);
+size_t crypto_kdf_blake2b_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_blake2b_derive_from_key(unsigned char *subkey, size_t 
subkey_len,
-                                       uint64_t subkey_id,
-                                       const char 
ctx[crypto_kdf_blake2b_CONTEXTBYTES],
-                                       const unsigned char 
key[crypto_kdf_blake2b_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_blake2b_derive_from_key (unsigned char *subkey, size_t
+                                        subkey_len,
+                                        uint64_t subkey_id,
+                                        const char
+                                        ctx[crypto_kdf_blake2b_CONTEXTBYTES],
+                                        const unsigned char
+                                        key[crypto_kdf_blake2b_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha256.h
index e7e7f4d..39ba301 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha256.h
@@ -18,54 +18,61 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha256_KEYBYTES crypto_auth_hmacsha256_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_keybytes(void);
+size_t crypto_kdf_hkdf_sha256_keybytes (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_min(void);
+size_t crypto_kdf_hkdf_sha256_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha256_BYTES_MAX (0xff * crypto_auth_hmacsha256_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_bytes_max(void);
+size_t crypto_kdf_hkdf_sha256_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(4)));
+int crypto_kdf_hkdf_sha256_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(4)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha256_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
+void crypto_kdf_hkdf_sha256_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha256_KEYBYTES]);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha256_state {
-    crypto_auth_hmacsha256_state st;
+typedef struct crypto_kdf_hkdf_sha256_state
+{
+  crypto_auth_hmacsha256_state st;
 } crypto_kdf_hkdf_sha256_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha256_statebytes(void);
+size_t crypto_kdf_hkdf_sha256_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_init(crypto_kdf_hkdf_sha256_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha256_extract_init (crypto_kdf_hkdf_sha256_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_update(crypto_kdf_hkdf_sha256_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_update (crypto_kdf_hkdf_sha256_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha256_extract_final(crypto_kdf_hkdf_sha256_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha256_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha256_extract_final (crypto_kdf_hkdf_sha256_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha256_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha512.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha512.h
index 0ed205d..bfcabdb 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha512.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kdf_hkdf_sha512.h
@@ -18,55 +18,62 @@ extern "C" {
 
 #define crypto_kdf_hkdf_sha512_KEYBYTES crypto_auth_hmacsha512_BYTES
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_keybytes(void);
+size_t crypto_kdf_hkdf_sha512_keybytes (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MIN 0U
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_min(void);
+size_t crypto_kdf_hkdf_sha512_bytes_min (void);
 
 #define crypto_kdf_hkdf_sha512_BYTES_MAX (0xff * crypto_auth_hmacsha512_BYTES)
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_bytes_max(void);
+size_t crypto_kdf_hkdf_sha512_bytes_max (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES],
-                                   const unsigned char *salt, size_t salt_len,
-                                   const unsigned char *ikm, size_t ikm_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES],
+                                    const unsigned char *salt, size_t salt_len,
+                                    const unsigned char *ikm, size_t ikm_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_kdf_hkdf_sha512_keygen(unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_kdf_hkdf_sha512_keygen (unsigned char
+                                    prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_expand(unsigned char *out, size_t out_len,
-                                  const char *ctx, size_t ctx_len,
-                                  const unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_expand (unsigned char *out, size_t out_len,
+                                   const char *ctx, size_t ctx_len,
+                                   const unsigned char
+                                   prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull(1)));
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct crypto_kdf_hkdf_sha512_state {
-    crypto_auth_hmacsha512_state st;
+typedef struct crypto_kdf_hkdf_sha512_state
+{
+  crypto_auth_hmacsha512_state st;
 } crypto_kdf_hkdf_sha512_state;
 
 SODIUM_EXPORT
-size_t crypto_kdf_hkdf_sha512_statebytes(void);
+size_t crypto_kdf_hkdf_sha512_statebytes (void);
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_init(crypto_kdf_hkdf_sha512_state *state,
-                                        const unsigned char *salt, size_t 
salt_len)
-            __attribute__ ((nonnull(1)));
+int crypto_kdf_hkdf_sha512_extract_init (crypto_kdf_hkdf_sha512_state *state,
+                                         const unsigned char *salt, size_t
+                                         salt_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_update(crypto_kdf_hkdf_sha512_state *state,
-                                          const unsigned char *ikm, size_t 
ikm_len)
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_update (crypto_kdf_hkdf_sha512_state *state,
+                                           const unsigned char *ikm, size_t
+                                           ikm_len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kdf_hkdf_sha512_extract_final(crypto_kdf_hkdf_sha512_state *state,
-                                         unsigned char 
prk[crypto_kdf_hkdf_sha512_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kdf_hkdf_sha512_extract_final (crypto_kdf_hkdf_sha512_state * state,
+                                          unsigned char
+                                          prk[crypto_kdf_hkdf_sha512_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kx.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kx.h
index 347132c..2227064 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kx.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_kx.h
@@ -14,50 +14,56 @@ extern "C" {
 
 #define crypto_kx_PUBLICKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_publickeybytes(void);
+size_t crypto_kx_publickeybytes (void);
 
 #define crypto_kx_SECRETKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_secretkeybytes(void);
+size_t crypto_kx_secretkeybytes (void);
 
 #define crypto_kx_SEEDBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_seedbytes(void);
+size_t crypto_kx_seedbytes (void);
 
 #define crypto_kx_SESSIONKEYBYTES 32
 SODIUM_EXPORT
-size_t crypto_kx_sessionkeybytes(void);
+size_t crypto_kx_sessionkeybytes (void);
 
 #define crypto_kx_PRIMITIVE "x25519blake2b"
 SODIUM_EXPORT
-const char *crypto_kx_primitive(void);
+const char *crypto_kx_primitive (void);
 
 SODIUM_EXPORT
-int crypto_kx_seed_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                           unsigned char sk[crypto_kx_SECRETKEYBYTES],
-                           const unsigned char seed[crypto_kx_SEEDBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_seed_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                            unsigned char sk[crypto_kx_SECRETKEYBYTES],
+                            const unsigned char seed[crypto_kx_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_keypair(unsigned char pk[crypto_kx_PUBLICKEYBYTES],
-                      unsigned char sk[crypto_kx_SECRETKEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_kx_keypair (unsigned char pk[crypto_kx_PUBLICKEYBYTES],
+                       unsigned char sk[crypto_kx_SECRETKEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_kx_client_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
client_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_client_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   client_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_kx_server_session_keys(unsigned char rx[crypto_kx_SESSIONKEYBYTES],
-                                  unsigned char tx[crypto_kx_SESSIONKEYBYTES],
-                                  const unsigned char 
server_pk[crypto_kx_PUBLICKEYBYTES],
-                                  const unsigned char 
server_sk[crypto_kx_SECRETKEYBYTES],
-                                  const unsigned char 
client_pk[crypto_kx_PUBLICKEYBYTES])
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 
4, 5)));
+int crypto_kx_server_session_keys (unsigned char rx[crypto_kx_SESSIONKEYBYTES],
+                                   unsigned char tx[crypto_kx_SESSIONKEYBYTES],
+                                   const unsigned char
+                                   server_pk[crypto_kx_PUBLICKEYBYTES],
+                                   const unsigned char
+                                   server_sk[crypto_kx_SECRETKEYBYTES],
+                                   const unsigned char
+                                   client_pk[crypto_kx_PUBLICKEYBYTES])
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull(3, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth.h
index 7cd7b07..25ada13 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth.h
@@ -16,47 +16,48 @@ extern "C" {
 typedef crypto_onetimeauth_poly1305_state crypto_onetimeauth_state;
 
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_statebytes(void);
+size_t  crypto_onetimeauth_statebytes (void);
 
 #define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_bytes(void);
+size_t  crypto_onetimeauth_bytes (void);
 
 #define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_onetimeauth_keybytes(void);
+size_t  crypto_onetimeauth_keybytes (void);
 
 #define crypto_onetimeauth_PRIMITIVE "poly1305"
 SODIUM_EXPORT
-const char *crypto_onetimeauth_primitive(void);
+const char *crypto_onetimeauth_primitive (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth(unsigned char *out, const unsigned char *in,
-                       unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth (unsigned char *out, const unsigned char *in,
+                        unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_verify(const unsigned char *h, const unsigned char *in,
-                              unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_verify (const unsigned char *h, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char 
*k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_init(crypto_onetimeauth_state *state,
-                            const unsigned char *key) __attribute__ 
((nonnull));
+int crypto_onetimeauth_init (crypto_onetimeauth_state *state,
+                             const unsigned char *key) __attribute__ (
+  (nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_update(crypto_onetimeauth_state *state,
-                              const unsigned char *in,
-                              unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_update (crypto_onetimeauth_state *state,
+                               const unsigned char *in,
+                               unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_final(crypto_onetimeauth_state *state,
-                             unsigned char *out) __attribute__ ((nonnull));
+int crypto_onetimeauth_final (crypto_onetimeauth_state *state,
+                              unsigned char *out) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_keygen(unsigned char k[crypto_onetimeauth_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_keygen (unsigned char k[crypto_onetimeauth_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth_poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth_poly1305.h
index 1565d37..027107c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth_poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_onetimeauth_poly1305.h
@@ -16,54 +16,57 @@
 extern "C" {
 #endif
 
-typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state {
-    unsigned char opaque[256];
+typedef struct CRYPTO_ALIGN(16) crypto_onetimeauth_poly1305_state
+{
+  unsigned char opaque[256];
 } crypto_onetimeauth_poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_statebytes(void);
+size_t crypto_onetimeauth_poly1305_statebytes (void);
 
 #define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_bytes(void);
+size_t crypto_onetimeauth_poly1305_bytes (void);
 
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_onetimeauth_poly1305_keybytes(void);
+size_t crypto_onetimeauth_poly1305_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305(unsigned char *out,
-                                const unsigned char *in,
-                                unsigned long long inlen,
-                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_onetimeauth_poly1305 (unsigned char *out,
+                                 const unsigned char *in,
+                                 unsigned long long inlen,
+                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_verify(const unsigned char *h,
-                                       const unsigned char *in,
-                                       unsigned long long inlen,
-                                       const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_onetimeauth_poly1305_verify (const unsigned char *h,
+                                        const unsigned char *in,
+                                        unsigned long long inlen,
+                                        const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_init(crypto_onetimeauth_poly1305_state *state,
-                                     const unsigned char *key)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_init (crypto_onetimeauth_poly1305_state *state,
+                                      const unsigned char *key)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_update(crypto_onetimeauth_poly1305_state 
*state,
-                                       const unsigned char *in,
-                                       unsigned long long inlen)
-            __attribute__ ((nonnull(1)));
+int crypto_onetimeauth_poly1305_update (
+  crypto_onetimeauth_poly1305_state *state,
+  const unsigned char *in,
+  unsigned long long inlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state,
-                                      unsigned char *out)
-            __attribute__ ((nonnull));
+int crypto_onetimeauth_poly1305_final (crypto_onetimeauth_poly1305_state 
*state,
+                                       unsigned char *out)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_onetimeauth_poly1305_keygen(unsigned char 
k[crypto_onetimeauth_poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_onetimeauth_poly1305_keygen (unsigned char
+                                         
k[crypto_onetimeauth_poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash.h
index 9683192..7e0ee9c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash.h
@@ -16,83 +16,87 @@ extern "C" {
 
 #define crypto_pwhash_ALG_ARGON2I13 crypto_pwhash_argon2i_ALG_ARGON2I13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2i13(void);
+int crypto_pwhash_alg_argon2i13 (void);
 
 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_argon2id13(void);
+int crypto_pwhash_alg_argon2id13 (void);
 
 #define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
-int crypto_pwhash_alg_default(void);
+int crypto_pwhash_alg_default (void);
 
 #define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_min(void);
+size_t crypto_pwhash_bytes_min (void);
 
 #define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_bytes_max(void);
+size_t crypto_pwhash_bytes_max (void);
 
 #define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_min(void);
+size_t crypto_pwhash_passwd_min (void);
 
 #define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_passwd_max(void);
+size_t crypto_pwhash_passwd_max (void);
 
 #define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_saltbytes(void);
+size_t crypto_pwhash_saltbytes (void);
 
 #define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
-size_t crypto_pwhash_strbytes(void);
+size_t crypto_pwhash_strbytes (void);
 
 #define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
-const char *crypto_pwhash_strprefix(void);
+const char *crypto_pwhash_strprefix (void);
 
 #define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_min(void);
+size_t crypto_pwhash_opslimit_min (void);
 
 #define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_max(void);
+size_t crypto_pwhash_opslimit_max (void);
 
 #define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_min(void);
+size_t crypto_pwhash_memlimit_min (void);
 
 #define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_max(void);
+size_t crypto_pwhash_memlimit_max (void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_interactive(void);
+size_t crypto_pwhash_opslimit_interactive (void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE 
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_interactive(void);
+size_t crypto_pwhash_memlimit_interactive (void);
 
 #define crypto_pwhash_OPSLIMIT_MODERATE 
crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_moderate(void);
+size_t crypto_pwhash_opslimit_moderate (void);
 
 #define crypto_pwhash_MEMLIMIT_MODERATE 
crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_moderate(void);
+size_t crypto_pwhash_memlimit_moderate (void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE 
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_opslimit_sensitive(void);
+size_t crypto_pwhash_opslimit_sensitive (void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE 
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE \
+  crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
-size_t crypto_pwhash_memlimit_sensitive(void);
+size_t crypto_pwhash_memlimit_sensitive (void);
 
 /*
  * With this function, do not forget to store all parameters, including the
@@ -101,11 +105,11 @@ size_t crypto_pwhash_memlimit_sensitive(void);
  * may change.
  */
 SODIUM_EXPORT
-int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
-                  const char * const passwd, unsigned long long passwdlen,
-                  const unsigned char * const salt,
-                  unsigned long long opslimit, size_t memlimit, int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash (unsigned char *const out, unsigned long long outlen,
+                   const char *const passwd, unsigned long long passwdlen,
+                   const unsigned char *const salt,
+                   unsigned long long opslimit, size_t memlimit, int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 /*
  * The output string already includes all the required parameters, including
@@ -113,32 +117,35 @@ int crypto_pwhash(unsigned char * const out, unsigned 
long long outlen,
  * order to verify a password.
  */
 SODIUM_EXPORT
-int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
-                      const char * const passwd, unsigned long long passwdlen,
-                      unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str (char out[crypto_pwhash_STRBYTES],
+                       const char *const passwd, unsigned long long passwdlen,
+                       unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
-                          const char * const passwd, unsigned long long 
passwdlen,
-                          unsigned long long opslimit, size_t memlimit, int 
alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_alg (char out[crypto_pwhash_STRBYTES],
+                           const char *const passwd, unsigned long long
+                           passwdlen,
+                           unsigned long long opslimit, size_t memlimit, int
+                           alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_verify(const char *str,
-                             const char * const passwd,
-                             unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_verify (const char *str,
+                              const char *const passwd,
+                              unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_str_needs_rehash(const char *str,
-                                   unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_str_needs_rehash (const char *str,
+                                    unsigned long long opslimit, size_t
+                                    memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
-const char *crypto_pwhash_primitive(void)
-            __attribute__ ((warn_unused_result));
+const char *crypto_pwhash_primitive (void)
+__attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2i.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2i.h
index 63abdf4..65b2bc4 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2i.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2i.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2i_ALG_ARGON2I13 1
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_alg_argon2i13(void);
+int crypto_pwhash_argon2i_alg_argon2i13 (void);
 
 #define crypto_pwhash_argon2i_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_min(void);
+size_t crypto_pwhash_argon2i_bytes_min (void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                    4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_bytes_max(void);
+size_t crypto_pwhash_argon2i_bytes_max (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_min(void);
+size_t crypto_pwhash_argon2i_passwd_min (void);
 
 #define crypto_pwhash_argon2i_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_passwd_max(void);
+size_t crypto_pwhash_argon2i_passwd_max (void);
 
 #define crypto_pwhash_argon2i_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_saltbytes(void);
+size_t crypto_pwhash_argon2i_saltbytes (void);
 
 #define crypto_pwhash_argon2i_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_strbytes(void);
+size_t crypto_pwhash_argon2i_strbytes (void);
 
 #define crypto_pwhash_argon2i_STRPREFIX "$argon2i$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2i_strprefix(void);
+const char *crypto_pwhash_argon2i_strprefix (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MIN 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_min(void);
+size_t crypto_pwhash_argon2i_opslimit_min (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_max(void);
+size_t crypto_pwhash_argon2i_opslimit_max (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_min(void);
+size_t crypto_pwhash_argon2i_memlimit_min (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_max(void);
+size_t crypto_pwhash_argon2i_memlimit_max (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_interactive(void);
+size_t crypto_pwhash_argon2i_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_interactive(void);
+size_t crypto_pwhash_argon2i_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_MODERATE 6U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_moderate(void);
+size_t crypto_pwhash_argon2i_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_MODERATE 134217728U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_moderate(void);
+size_t crypto_pwhash_argon2i_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE 8U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2i_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE 536870912U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2i_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2i_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i(unsigned char * const out,
-                          unsigned long long outlen,
-                          const char * const passwd,
-                          unsigned long long passwdlen,
-                          const unsigned char * const salt,
-                          unsigned long long opslimit, size_t memlimit,
-                          int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i (unsigned char *const out,
+                           unsigned long long outlen,
+                           const char *const passwd,
+                           unsigned long long passwdlen,
+                           const unsigned char *const salt,
+                           unsigned long long opslimit, size_t memlimit,
+                           int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str(char out[crypto_pwhash_argon2i_STRBYTES],
-                              const char * const passwd,
-                              unsigned long long passwdlen,
-                              unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str (char out[crypto_pwhash_argon2i_STRBYTES],
+                               const char *const passwd,
+                               unsigned long long passwdlen,
+                               unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_verify(const char * str,
-                                     const char * const passwd,
-                                     unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_verify (const char *str,
+                                      const char *const passwd,
+                                      unsigned long long passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2i_str_needs_rehash(const char * str,
-                                           unsigned long long opslimit, size_t 
memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2i_str_needs_rehash (const char *str,
+                                            unsigned long long opslimit, size_t
+                                            memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2id.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2id.h
index 98bc83e..6a2194f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2id.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_argon2id.h
@@ -16,104 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_alg_argon2id13(void);
+int crypto_pwhash_argon2id_alg_argon2id13 (void);
 
 #define crypto_pwhash_argon2id_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_min(void);
+size_t crypto_pwhash_argon2id_bytes_min (void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 
4294967295U)
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, \
+                                                     4294967295U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_bytes_max(void);
+size_t crypto_pwhash_argon2id_bytes_max (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_min(void);
+size_t crypto_pwhash_argon2id_passwd_min (void);
 
 #define crypto_pwhash_argon2id_PASSWD_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_passwd_max(void);
+size_t crypto_pwhash_argon2id_passwd_max (void);
 
 #define crypto_pwhash_argon2id_SALTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_saltbytes(void);
+size_t crypto_pwhash_argon2id_saltbytes (void);
 
 #define crypto_pwhash_argon2id_STRBYTES 128U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_strbytes(void);
+size_t crypto_pwhash_argon2id_strbytes (void);
 
 #define crypto_pwhash_argon2id_STRPREFIX "$argon2id$"
 SODIUM_EXPORT
-const char *crypto_pwhash_argon2id_strprefix(void);
+const char *crypto_pwhash_argon2id_strprefix (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MIN 1U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_min(void);
+size_t crypto_pwhash_argon2id_opslimit_min (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_max(void);
+size_t crypto_pwhash_argon2id_opslimit_max (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MIN 8192U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_min(void);
+size_t crypto_pwhash_argon2id_memlimit_min (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MAX \
-    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) 
? 2147483648U : 32768U)
+  ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 
\
+   2147483648U : 32768U)
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_max(void);
+size_t crypto_pwhash_argon2id_memlimit_max (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE 2U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_interactive(void);
+size_t crypto_pwhash_argon2id_opslimit_interactive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE 67108864U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_interactive(void);
+size_t crypto_pwhash_argon2id_memlimit_interactive (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_MODERATE 3U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_moderate(void);
+size_t crypto_pwhash_argon2id_opslimit_moderate (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_MODERATE 268435456U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_moderate(void);
+size_t crypto_pwhash_argon2id_memlimit_moderate (void);
 
 #define crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE 4U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_opslimit_sensitive(void);
+size_t crypto_pwhash_argon2id_opslimit_sensitive (void);
 
 #define crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_argon2id_memlimit_sensitive(void);
+size_t crypto_pwhash_argon2id_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id(unsigned char * const out,
-                           unsigned long long outlen,
-                           const char * const passwd,
-                           unsigned long long passwdlen,
-                           const unsigned char * const salt,
-                           unsigned long long opslimit, size_t memlimit,
-                           int alg)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id (unsigned char *const out,
+                            unsigned long long outlen,
+                            const char *const passwd,
+                            unsigned long long passwdlen,
+                            const unsigned char *const salt,
+                            unsigned long long opslimit, size_t memlimit,
+                            int alg)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str(char out[crypto_pwhash_argon2id_STRBYTES],
-                               const char * const passwd,
-                               unsigned long long passwdlen,
-                               unsigned long long opslimit, size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str (char out[crypto_pwhash_argon2id_STRBYTES],
+                                const char *const passwd,
+                                unsigned long long passwdlen,
+                                unsigned long long opslimit, size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_verify(const char * str,
-                                      const char * const passwd,
-                                      unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_verify (const char *str,
+                                       const char *const passwd,
+                                       unsigned long long passwdlen)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_argon2id_str_needs_rehash(const char * str,
-                                            unsigned long long opslimit, 
size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_argon2id_str_needs_rehash (const char *str,
+                                             unsigned long long opslimit, 
size_t
+                                             memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
index 8956dfb..ed33309 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
@@ -16,102 +16,107 @@ extern "C" {
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MIN 16U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
+  SODIUM_MIN (SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_bytes_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MIN 0U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_passwd_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_SALTBYTES 32U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_saltbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRBYTES 102U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void);
+size_t crypto_pwhash_scryptsalsa208sha256_strbytes (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$"
 SODIUM_EXPORT
-const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void);
+const char *crypto_pwhash_scryptsalsa208sha256_strprefix (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MIN 32768U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_MAX 4294967295U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MIN 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
-    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
+  SODIUM_MIN (SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE 16777216U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_interactive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE 33554432U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive (void);
 
 #define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE 1073741824U
 SODIUM_EXPORT
-size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive(void);
+size_t crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive (void);
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256(unsigned char * const out,
-                                       unsigned long long outlen,
-                                       const char * const passwd,
-                                       unsigned long long passwdlen,
-                                       const unsigned char * const salt,
-                                       unsigned long long opslimit,
-                                       size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256 (unsigned char *const out,
+                                        unsigned long long outlen,
+                                        const char *const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char *const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str(char 
out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
-                                           const char * const passwd,
-                                           unsigned long long passwdlen,
-                                           unsigned long long opslimit,
-                                           size_t memlimit)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str (char
+                                            out[
+                                              
crypto_pwhash_scryptsalsa208sha256_STRBYTES
+                                            ],
+                                            const char *const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_verify(const char * str,
-                                                  const char * const passwd,
-                                                  unsigned long long passwdlen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_verify (const char *str,
+                                                   const char *const passwd,
+                                                   unsigned long long 
passwdlen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t 
passwdlen,
-                                          const uint8_t * salt, size_t saltlen,
-                                          uint64_t N, uint32_t r, uint32_t p,
-                                          uint8_t * buf, size_t buflen)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_ll (const uint8_t *passwd, size_t
+                                           passwdlen,
+                                           const uint8_t *salt, size_t saltlen,
+                                           uint64_t N, uint32_t r, uint32_t p,
+                                           uint8_t *buf, size_t buflen)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char * str,
-                                                        unsigned long long 
opslimit,
-                                                        size_t memlimit)
-            __attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash (const char *str,
+                                                         unsigned long long
+                                                         opslimit,
+                                                         size_t memlimit)
+__attribute__ ((warn_unused_result))  __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult.h
index 1c68585..15586d3 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult.h
@@ -12,19 +12,19 @@ extern "C" {
 
 #define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_bytes(void);
+size_t  crypto_scalarmult_bytes (void);
 
 #define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
 SODIUM_EXPORT
-size_t  crypto_scalarmult_scalarbytes(void);
+size_t  crypto_scalarmult_scalarbytes (void);
 
 #define crypto_scalarmult_PRIMITIVE "curve25519"
 SODIUM_EXPORT
-const char *crypto_scalarmult_primitive(void);
+const char *crypto_scalarmult_primitive (void);
 
 SODIUM_EXPORT
-int crypto_scalarmult_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -35,9 +35,9 @@ int crypto_scalarmult_base(unsigned char *q, const unsigned 
char *n)
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult(unsigned char *q, const unsigned char *n,
-                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult (unsigned char *q, const unsigned char *n,
+                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_curve25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_curve25519.h
index 60e9d0c..9cde57c 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_curve25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_curve25519.h
@@ -11,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_curve25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_bytes(void);
+size_t crypto_scalarmult_curve25519_bytes (void);
 
 #define crypto_scalarmult_curve25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_curve25519_scalarbytes(void);
+size_t crypto_scalarmult_curve25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -26,14 +26,14 @@ size_t crypto_scalarmult_curve25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
-                                 const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519 (unsigned char *q, const unsigned char *n,
+                                  const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_curve25519_base(unsigned char *q,
-                                      const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_curve25519_base (unsigned char *q,
+                                       const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ed25519.h
index 2dfa4d7..749c0c1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ed25519.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ed25519_H
 #define crypto_scalarmult_ed25519_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ed25519_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_bytes(void);
+size_t crypto_scalarmult_ed25519_bytes (void);
 
 #define crypto_scalarmult_ed25519_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ed25519_scalarbytes(void);
+size_t crypto_scalarmult_ed25519_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,22 +26,23 @@ size_t crypto_scalarmult_ed25519_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519(unsigned char *q, const unsigned char *n,
-                              const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519 (unsigned char *q, const unsigned char *n,
+                               const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_noclamp(unsigned char *q, const unsigned char *n,
-                                      const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_noclamp (unsigned char *q, const unsigned char 
*n,
+                                       const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base(unsigned char *q, const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base (unsigned char *q, const unsigned char *n)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ed25519_base_noclamp(unsigned char *q, const unsigned 
char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ed25519_base_noclamp (unsigned char *q, const unsigned
+                                            char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ristretto255.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ristretto255.h
index 40a45cc..b1840a1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ristretto255.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_scalarmult_ristretto255.h
@@ -1,4 +1,3 @@
-
 #ifndef crypto_scalarmult_ristretto255_H
 #define crypto_scalarmult_ristretto255_H
 
@@ -12,11 +11,11 @@ extern "C" {
 
 #define crypto_scalarmult_ristretto255_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_bytes(void);
+size_t crypto_scalarmult_ristretto255_bytes (void);
 
 #define crypto_scalarmult_ristretto255_SCALARBYTES 32U
 SODIUM_EXPORT
-size_t crypto_scalarmult_ristretto255_scalarbytes(void);
+size_t crypto_scalarmult_ristretto255_scalarbytes (void);
 
 /*
  * NOTE: Do not use the result of this function directly for key exchange.
@@ -27,14 +26,14 @@ size_t crypto_scalarmult_ristretto255_scalarbytes(void);
  * Or unless this is not an option, use the crypto_kx() API instead.
  */
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255(unsigned char *q, const unsigned char *n,
-                                   const unsigned char *p)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255 (unsigned char *q, const unsigned char *n,
+                                    const unsigned char *p)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_scalarmult_ristretto255_base(unsigned char *q,
-                                        const unsigned char *n)
-            __attribute__ ((nonnull));
+int crypto_scalarmult_ristretto255_base (unsigned char *q,
+                                         const unsigned char *n)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox.h
index 1d3709d..c764617 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox.h
@@ -15,76 +15,80 @@ extern "C" {
 
 #define crypto_secretbox_KEYBYTES crypto_secretbox_xsalsa20poly1305_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_keybytes(void);
+size_t  crypto_secretbox_keybytes (void);
 
 #define crypto_secretbox_NONCEBYTES 
crypto_secretbox_xsalsa20poly1305_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_noncebytes(void);
+size_t  crypto_secretbox_noncebytes (void);
 
 #define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_macbytes(void);
+size_t  crypto_secretbox_macbytes (void);
 
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
-const char *crypto_secretbox_primitive(void);
+const char *crypto_secretbox_primitive (void);
 
-#define crypto_secretbox_MESSAGEBYTES_MAX 
crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+#define crypto_secretbox_MESSAGEBYTES_MAX \
+  crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t crypto_secretbox_messagebytes_max(void);
+size_t crypto_secretbox_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
-                          unsigned long long mlen, const unsigned char *n,
-                          const unsigned char *k) __attribute__ ((nonnull(1, 
4, 5)));
+int crypto_secretbox_easy (unsigned char *c, const unsigned char *m,
+                           unsigned long long mlen, const unsigned char *n,
+                           const unsigned char *k) __attribute__ ((nonnull(1, 
4,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
-                               unsigned long long clen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open_easy (unsigned char *m, const unsigned char *c,
+                                unsigned long long clen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
-                              const unsigned char *m,
-                              unsigned long long mlen,
-                              const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_detached (unsigned char *c, unsigned char *mac,
+                               const unsigned char *m,
+                               unsigned long long mlen,
+                               const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open_detached(unsigned char *m,
-                                   const unsigned char *c,
-                                   const unsigned char *mac,
-                                   unsigned long long clen,
-                                   const unsigned char *n,
-                                   const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_open_detached (unsigned char *m,
+                                    const unsigned char *c,
+                                    const unsigned char *mac,
+                                    unsigned long long clen,
+                                    const unsigned char *n,
+                                    const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 SODIUM_EXPORT
-void crypto_secretbox_keygen(unsigned char k[crypto_secretbox_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_keygen (unsigned char k[crypto_secretbox_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_ZEROBYTES crypto_secretbox_xsalsa20poly1305_ZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_zerobytes(void);
+size_t  crypto_secretbox_zerobytes (void);
 
-#define crypto_secretbox_BOXZEROBYTES 
crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
+#define crypto_secretbox_BOXZEROBYTES \
+  crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES
 SODIUM_EXPORT
-size_t  crypto_secretbox_boxzerobytes(void);
+size_t  crypto_secretbox_boxzerobytes (void);
 
 SODIUM_EXPORT
-int crypto_secretbox(unsigned char *c, const unsigned char *m,
-                     unsigned long long mlen, const unsigned char *n,
-                     const unsigned char *k) __attribute__ ((nonnull(1, 4, 
5)));
+int crypto_secretbox (unsigned char *c, const unsigned char *m,
+                      unsigned long long mlen, const unsigned char *n,
+                      const unsigned char *k) __attribute__ ((nonnull(1, 4,
+                                                                      5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
-                          unsigned long long clen, const unsigned char *n,
-                          const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_open (unsigned char *m, const unsigned char *c,
+                           unsigned long long clen, const unsigned char *n,
+                           const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xchacha20poly1305.h
index 6ec674e..509fac9 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xchacha20poly1305.h
@@ -14,54 +14,55 @@ extern "C" {
 
 #define crypto_secretbox_xchacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_keybytes(void);
+size_t crypto_secretbox_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
+size_t crypto_secretbox_xchacha20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
+size_t crypto_secretbox_xchacha20poly1305_macbytes (void);
 
 #define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - 
crypto_secretbox_xchacha20poly1305_MACBYTES)
+  (crypto_stream_xchacha20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xchacha20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
-                                            const unsigned char *m,
-                                            unsigned long long mlen,
-                                            const unsigned char *n,
-                                            const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xchacha20poly1305_easy (unsigned char *c,
+                                             const unsigned char *m,
+                                             unsigned long long mlen,
+                                             const unsigned char *n,
+                                             const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_easy(unsigned char *m,
-                                                 const unsigned char *c,
-                                                 unsigned long long clen,
-                                                 const unsigned char *n,
-                                                 const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xchacha20poly1305_open_easy (unsigned char *m,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
-                                                unsigned char *mac,
-                                                const unsigned char *m,
-                                                unsigned long long mlen,
-                                                const unsigned char *n,
-                                                const unsigned char *k)
-            __attribute__ ((nonnull(1, 2, 5, 6)));
+int crypto_secretbox_xchacha20poly1305_detached (unsigned char *c,
+                                                 unsigned char *mac,
+                                                 const unsigned char *m,
+                                                 unsigned long long mlen,
+                                                 const unsigned char *n,
+                                                 const unsigned char *k)
+__attribute__ ((nonnull(1, 2, 5, 6)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
-                                                     const unsigned char *c,
-                                                     const unsigned char *mac,
-                                                     unsigned long long clen,
-                                                     const unsigned char *n,
-                                                     const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 
5, 6)));
+int crypto_secretbox_xchacha20poly1305_open_detached (unsigned char *m,
+                                                      const unsigned char *c,
+                                                      const unsigned char *mac,
+                                                      unsigned long long clen,
+                                                      const unsigned char *n,
+                                                      const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 3, 5, 6)));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xsalsa20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xsalsa20poly1305.h
index be0874c..18c9bfc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xsalsa20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretbox_xsalsa20poly1305.h
@@ -14,53 +14,57 @@ extern "C" {
 
 #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_keybytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_noncebytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes (void);
 
 /* Only for the libsodium API - The NaCl compatibility API would require 
BOXZEROBYTES extra bytes */
 #define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
-    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - 
crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_stream_xsalsa20_MESSAGEBYTES_MAX \
+   - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
-                                      const unsigned char *m,
-                                      unsigned long long mlen,
-                                      const unsigned char *n,
-                                      const unsigned char *k)
-            __attribute__ ((nonnull(1, 4, 5)));
+int crypto_secretbox_xsalsa20poly1305 (unsigned char *c,
+                                       const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n,
+                                       const unsigned char *k)
+__attribute__ ((nonnull(1, 4, 5)));
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
-                                           const unsigned char *c,
-                                           unsigned long long clen,
-                                           const unsigned char *n,
-                                           const unsigned char *k)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 
5)));
+int crypto_secretbox_xsalsa20poly1305_open (unsigned char *m,
+                                            const unsigned char *c,
+                                            unsigned long long clen,
+                                            const unsigned char *n,
+                                            const unsigned char *k)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(2, 4, 5)));
 
 SODIUM_EXPORT
-void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char 
k[crypto_secretbox_xsalsa20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_secretbox_xsalsa20poly1305_keygen (unsigned char
+                                               k[
+                                                 
crypto_secretbox_xsalsa20poly1305_KEYBYTES
+                                               ])
+__attribute__ ((nonnull));
 
 /* -- NaCl compatibility interface ; Requires padding -- */
 
 #define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes (void);
 
 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+  (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES   \
+   + crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretstream_xchacha20poly1305.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretstream_xchacha20poly1305.h
index b22e4e9..6b8b135 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretstream_xchacha20poly1305.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_secretstream_xchacha20poly1305.h
@@ -15,91 +15,100 @@ extern "C" {
 #endif
 
 #define crypto_secretstream_xchacha20poly1305_ABYTES \
-    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+  (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+size_t crypto_secretstream_xchacha20poly1305_abytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
-    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+  crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+size_t crypto_secretstream_xchacha20poly1305_headerbytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_KEYBYTES \
-    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+size_t crypto_secretstream_xchacha20poly1305_keybytes (void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, 
\
+  SODIUM_MIN (SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
               (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey (void);
 
 #define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
-    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
-     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+  (crypto_secretstream_xchacha20poly1305_TAG_PUSH   \
+   | crypto_secretstream_xchacha20poly1305_TAG_REKEY)
 SODIUM_EXPORT
-unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final (void);
 
-typedef struct crypto_secretstream_xchacha20poly1305_state {
-    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
-    unsigned char _pad[8];
+typedef struct crypto_secretstream_xchacha20poly1305_state
+{
+  unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+  unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+  unsigned char _pad[8];
 } crypto_secretstream_xchacha20poly1305_state;
 
 SODIUM_EXPORT
-size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+size_t crypto_secretstream_xchacha20poly1305_statebytes (void);
 
 SODIUM_EXPORT
 void crypto_secretstream_xchacha20poly1305_keygen
-   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
 int crypto_secretstream_xchacha20poly1305_init_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+  (crypto_secretstream_xchacha20poly1305_state * state,
+  unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_push
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *c, unsigned long long *clen_p,
-    const unsigned char *m, unsigned long long mlen,
-    const unsigned char *ad, unsigned long long adlen, unsigned char tag)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_push (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *c, unsigned long
+  long *clen_p,
+  const unsigned char *m, unsigned
+  long long mlen,
+  const unsigned char *ad,
+  unsigned long long adlen, unsigned char tag)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_init_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    const unsigned char 
header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
-    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
-            __attribute__ ((nonnull));
+int crypto_secretstream_xchacha20poly1305_init_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  const unsigned char
+  header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+  const unsigned char
+  k[crypto_secretstream_xchacha20poly1305_KEYBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_secretstream_xchacha20poly1305_pull
-   (crypto_secretstream_xchacha20poly1305_state *state,
-    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
-    const unsigned char *c, unsigned long long clen,
-    const unsigned char *ad, unsigned long long adlen)
-            __attribute__ ((nonnull(1)));
+int crypto_secretstream_xchacha20poly1305_pull (
+  crypto_secretstream_xchacha20poly1305_state *state,
+  unsigned char *m, unsigned long
+  long *mlen_p, unsigned char *tag_p,
+  const unsigned char *c, unsigned
+  long long clen,
+  const unsigned char *ad,
+  unsigned long long adlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-void crypto_secretstream_xchacha20poly1305_rekey
-    (crypto_secretstream_xchacha20poly1305_state *state);
+void crypto_secretstream_xchacha20poly1305_rekey (
+  crypto_secretstream_xchacha20poly1305_state *state);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash.h
index fecaa88..399538d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash.h
@@ -15,24 +15,24 @@ extern "C" {
 
 #define crypto_shorthash_BYTES crypto_shorthash_siphash24_BYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_bytes(void);
+size_t  crypto_shorthash_bytes (void);
 
 #define crypto_shorthash_KEYBYTES crypto_shorthash_siphash24_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_shorthash_keybytes(void);
+size_t  crypto_shorthash_keybytes (void);
 
 #define crypto_shorthash_PRIMITIVE "siphash24"
 SODIUM_EXPORT
-const char *crypto_shorthash_primitive(void);
+const char *crypto_shorthash_primitive (void);
 
 SODIUM_EXPORT
-int crypto_shorthash(unsigned char *out, const unsigned char *in,
-                     unsigned long long inlen, const unsigned char *k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash (unsigned char *out, const unsigned char *in,
+                      unsigned long long inlen, const unsigned char *k)
+__attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-void crypto_shorthash_keygen(unsigned char k[crypto_shorthash_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_shorthash_keygen (unsigned char k[crypto_shorthash_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash_siphash24.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash_siphash24.h
index 1e6f72a..f179919 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash_siphash24.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_shorthash_siphash24.h
@@ -15,32 +15,35 @@ extern "C" {
 
 #define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_bytes(void);
+size_t crypto_shorthash_siphash24_bytes (void);
 
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphash24_keybytes(void);
+size_t crypto_shorthash_siphash24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
-                               unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphash24 (unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned
+                                char *k)
+__attribute__ ((nonnull(1, 4)));
 
 #ifndef SODIUM_LIBRARY_MINIMAL
 /* -- 128-bit output -- */
 
 #define crypto_shorthash_siphashx24_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_bytes(void);
+size_t crypto_shorthash_siphashx24_bytes (void);
 
 #define crypto_shorthash_siphashx24_KEYBYTES 16U
 SODIUM_EXPORT
-size_t crypto_shorthash_siphashx24_keybytes(void);
+size_t crypto_shorthash_siphashx24_keybytes (void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphashx24(unsigned char *out, const unsigned char *in,
-                                unsigned long long inlen, const unsigned char 
*k)
-            __attribute__ ((nonnull(1, 4)));
+int crypto_shorthash_siphashx24 (unsigned char *out, const unsigned char *in,
+                                 unsigned long long inlen, const unsigned
+                                 char *k)
+__attribute__ ((nonnull(1, 4)));
+
 #endif
 
 #ifdef __cplusplus
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign.h
index f5fafb1..9879476 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign.h
@@ -23,82 +23,84 @@ extern "C" {
 typedef crypto_sign_ed25519ph_state crypto_sign_state;
 
 SODIUM_EXPORT
-size_t  crypto_sign_statebytes(void);
+size_t  crypto_sign_statebytes (void);
 
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES
 SODIUM_EXPORT
-size_t  crypto_sign_bytes(void);
+size_t  crypto_sign_bytes (void);
 
 #define crypto_sign_SEEDBYTES crypto_sign_ed25519_SEEDBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_seedbytes(void);
+size_t  crypto_sign_seedbytes (void);
 
 #define crypto_sign_PUBLICKEYBYTES crypto_sign_ed25519_PUBLICKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_publickeybytes(void);
+size_t  crypto_sign_publickeybytes (void);
 
 #define crypto_sign_SECRETKEYBYTES crypto_sign_ed25519_SECRETKEYBYTES
 SODIUM_EXPORT
-size_t  crypto_sign_secretkeybytes(void);
+size_t  crypto_sign_secretkeybytes (void);
 
 #define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_sign_messagebytes_max(void);
+size_t  crypto_sign_messagebytes_max (void);
 
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
-const char *crypto_sign_primitive(void);
+const char *crypto_sign_primitive (void);
 
 SODIUM_EXPORT
-int crypto_sign_seed_keypair(unsigned char *pk, unsigned char *sk,
-                             const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_seed_keypair (unsigned char *pk, unsigned char *sk,
+                              const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
-                const unsigned char *m, unsigned long long mlen,
-                const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
+int crypto_sign (unsigned char *sm, unsigned long long *smlen_p,
+                 const unsigned char *m, unsigned long long mlen,
+                 const unsigned char *sk) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
-                     const unsigned char *sm, unsigned long long smlen,
-                     const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+int crypto_sign_open (unsigned char *m, unsigned long long *mlen_p,
+                      const unsigned char *sm, unsigned long long smlen,
+                      const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
-                         const unsigned char *m, unsigned long long mlen,
-                         const unsigned char *sk) __attribute__ ((nonnull(1, 
5)));
+int crypto_sign_detached (unsigned char *sig, unsigned long long *siglen_p,
+                          const unsigned char *m, unsigned long long mlen,
+                          const unsigned char *sk) __attribute__ ((nonnull(1,
+                                                                           
5)));
 
 SODIUM_EXPORT
-int crypto_sign_verify_detached(const unsigned char *sig,
-                                const unsigned char *m,
-                                unsigned long long mlen,
-                                const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_verify_detached (const unsigned char *sig,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_init(crypto_sign_state *state);
+int crypto_sign_init (crypto_sign_state *state);
 
 SODIUM_EXPORT
-int crypto_sign_update(crypto_sign_state *state,
-                       const unsigned char *m, unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_update (crypto_sign_state *state,
+                        const unsigned char *m, unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_final_create(crypto_sign_state *state, unsigned char *sig,
-                             unsigned long long *siglen_p,
-                             const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_final_create (crypto_sign_state *state, unsigned char *sig,
+                              unsigned long long *siglen_p,
+                              const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_final_verify(crypto_sign_state *state, const unsigned char 
*sig,
-                             const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_final_verify (crypto_sign_state *state, const unsigned
+                              char *sig,
+                              const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_ed25519.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_ed25519.h
index 0fdac42..ba08826 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_ed25519.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_ed25519.h
@@ -12,110 +12,112 @@
 extern "C" {
 #endif
 
-typedef struct crypto_sign_ed25519ph_state {
-    crypto_hash_sha512_state hs;
+typedef struct crypto_sign_ed25519ph_state
+{
+  crypto_hash_sha512_state hs;
 } crypto_sign_ed25519ph_state;
 
 SODIUM_EXPORT
-size_t crypto_sign_ed25519ph_statebytes(void);
+size_t crypto_sign_ed25519ph_statebytes (void);
 
 #define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_bytes(void);
+size_t crypto_sign_ed25519_bytes (void);
 
 #define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_seedbytes(void);
+size_t crypto_sign_ed25519_seedbytes (void);
 
 #define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_publickeybytes(void);
+size_t crypto_sign_ed25519_publickeybytes (void);
 
 #define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_secretkeybytes(void);
+size_t crypto_sign_ed25519_secretkeybytes (void);
 
-#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - 
crypto_sign_ed25519_BYTES)
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                              - crypto_sign_ed25519_BYTES)
 SODIUM_EXPORT
-size_t crypto_sign_ed25519_messagebytes_max(void);
+size_t crypto_sign_ed25519_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
-                        const unsigned char *m, unsigned long long mlen,
-                        const unsigned char *sk)
-            __attribute__ ((nonnull(1, 5)));
+int crypto_sign_ed25519 (unsigned char *sm, unsigned long long *smlen_p,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 
5)));
+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)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((nonnull(1, 5)));
+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)
+__attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 
4)));
+int crypto_sign_ed25519_verify_detached (const unsigned char *sig,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_keypair (unsigned char *pk, unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
-                                     const unsigned char *seed)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_seed_keypair (unsigned char *pk, unsigned char *sk,
+                                      const unsigned char *seed)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
-                                         const unsigned char *ed25519_pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519_pk_to_curve25519 (unsigned char *curve25519_pk,
+                                          const unsigned char *ed25519_pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_curve25519(unsigned char *curve25519_sk,
-                                         const unsigned char *ed25519_sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_curve25519 (unsigned char *curve25519_sk,
+                                          const unsigned char *ed25519_sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_seed(unsigned char *seed,
-                                   const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_seed (unsigned char *seed,
+                                    const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_sk_to_pk(unsigned char *pk, const unsigned char *sk)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519_sk_to_pk (unsigned char *pk, const unsigned char *sk)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_init(crypto_sign_ed25519ph_state *state)
-            __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_init (crypto_sign_ed25519ph_state *state)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_update(crypto_sign_ed25519ph_state *state,
-                                 const unsigned char *m,
-                                 unsigned long long mlen)
-            __attribute__ ((nonnull(1)));
+int crypto_sign_ed25519ph_update (crypto_sign_ed25519ph_state *state,
+                                  const unsigned char *m,
+                                  unsigned long long mlen)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_create(crypto_sign_ed25519ph_state *state,
-                                       unsigned char *sig,
-                                       unsigned long long *siglen_p,
-                                       const unsigned char *sk)
-            __attribute__ ((nonnull(1, 2, 4)));
+int crypto_sign_ed25519ph_final_create (crypto_sign_ed25519ph_state *state,
+                                        unsigned char *sig,
+                                        unsigned long long *siglen_p,
+                                        const unsigned char *sk)
+__attribute__ ((nonnull(1, 2, 4)));
 
 SODIUM_EXPORT
-int crypto_sign_ed25519ph_final_verify(crypto_sign_ed25519ph_state *state,
-                                       const unsigned char *sig,
-                                       const unsigned char *pk)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_sign_ed25519ph_final_verify (crypto_sign_ed25519ph_state *state,
+                                        const unsigned char *sig,
+                                        const unsigned char *pk)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_edwards25519sha512batch.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_edwards25519sha512batch.h
index eed158a..bcfba7b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_edwards25519sha512batch.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_sign_edwards25519sha512batch.h
@@ -25,28 +25,30 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
-#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX 
- crypto_sign_edwards25519sha512batch_BYTES)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX \
+                                                              - \
+                                                              
crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *sm,
-                                        unsigned long long *smlen_p,
-                                        const unsigned char *m,
-                                        unsigned long long mlen,
-                                        const unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
+int crypto_sign_edwards25519sha512batch (unsigned char *sm,
+                                         unsigned long long *smlen_p,
+                                         const unsigned char *m,
+                                         unsigned long long mlen,
+                                         const unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(1, 5)));
 
 SODIUM_EXPORT
-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)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
+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)
+__attribute__ ((deprecated)) __attribute__ ((nonnull(3, 5)));
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
-                                                unsigned char *sk)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_sign_edwards25519sha512batch_keypair (unsigned char *pk,
+                                                 unsigned char *sk)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream.h
index 88dab5f..c8efcdc 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream.h
@@ -23,34 +23,34 @@ extern "C" {
 
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_keybytes(void);
+size_t  crypto_stream_keybytes (void);
 
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
 SODIUM_EXPORT
-size_t  crypto_stream_noncebytes(void);
+size_t  crypto_stream_noncebytes (void);
 
 #define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
 SODIUM_EXPORT
-size_t  crypto_stream_messagebytes_max(void);
+size_t  crypto_stream_messagebytes_max (void);
 
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
-const char *crypto_stream_primitive(void);
+const char *crypto_stream_primitive (void);
 
 SODIUM_EXPORT
-int crypto_stream(unsigned char *c, unsigned long long clen,
-                  const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream (unsigned char *c, unsigned long long clen,
+                   const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xor(unsigned char *c, const unsigned char *m,
-                      unsigned long long mlen, const unsigned char *n,
-                      const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xor (unsigned char *c, const unsigned char *m,
+                       unsigned long long mlen, const unsigned char *n,
+                       const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_keygen(unsigned char k[crypto_stream_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_keygen (unsigned char k[crypto_stream_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_chacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_chacha20.h
index 4088975..e276a7d 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_chacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_chacha20.h
@@ -22,82 +22,89 @@ extern "C" {
 
 #define crypto_stream_chacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_keybytes(void);
+size_t crypto_stream_chacha20_keybytes (void);
 
 #define crypto_stream_chacha20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_noncebytes(void);
+size_t crypto_stream_chacha20_noncebytes (void);
 
 #define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_messagebytes_max(void);
+size_t crypto_stream_chacha20_messagebytes_max (void);
 
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
-int crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_keygen(unsigned char 
k[crypto_stream_chacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_keygen (unsigned char
+                                    k[crypto_stream_chacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* ChaCha20 with a 96-bit nonce and a 32-bit counter (IETF) */
 
 #define crypto_stream_chacha20_ietf_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_keybytes(void);
+size_t crypto_stream_chacha20_ietf_keybytes (void);
 
 #define crypto_stream_chacha20_ietf_NONCEBYTES 12U
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_noncebytes(void);
+size_t crypto_stream_chacha20_ietf_noncebytes (void);
 
 #define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+  SODIUM_MIN (SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
 SODIUM_EXPORT
-size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+size_t crypto_stream_chacha20_ietf_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
-                                const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf (unsigned char *c, unsigned long long clen,
+                                 const unsigned char *n, const unsigned char 
*k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
-                                    unsigned long long mlen, const unsigned 
char *n,
-                                    const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor (unsigned char *c, const unsigned char *m,
+                                     unsigned long long mlen, const unsigned
+                                     char *n,
+                                     const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char 
*m,
-                                       unsigned long long mlen,
-                                       const unsigned char *n, uint32_t ic,
-                                       const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_chacha20_ietf_xor_ic (unsigned char *c, const unsigned
+                                        char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *n, uint32_t ic,
+                                        const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_chacha20_ietf_keygen(unsigned char 
k[crypto_stream_chacha20_ietf_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_chacha20_ietf_keygen (unsigned char
+                                         
k[crypto_stream_chacha20_ietf_KEYBYTES])
+__attribute__ ((nonnull));
 
 /* Aliases */
 
-#define crypto_stream_chacha20_IETF_KEYBYTES 
crypto_stream_chacha20_ietf_KEYBYTES
-#define crypto_stream_chacha20_IETF_NONCEBYTES 
crypto_stream_chacha20_ietf_NONCEBYTES
-#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX 
crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
+#define crypto_stream_chacha20_IETF_KEYBYTES \
+  crypto_stream_chacha20_ietf_KEYBYTES
+#define crypto_stream_chacha20_IETF_NONCEBYTES \
+  crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX \
+  crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa20.h
index 45b3b3e..e677477 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_keybytes(void);
+size_t crypto_stream_salsa20_keybytes (void);
 
 #define crypto_stream_salsa20_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_noncebytes(void);
+size_t crypto_stream_salsa20_noncebytes (void);
 
 #define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa20_messagebytes_max(void);
+size_t crypto_stream_salsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
-                          const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20 (unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
-                              unsigned long long mlen, const unsigned char *n,
-                              const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor (unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                 unsigned long long mlen,
-                                 const unsigned char *n, uint64_t ic,
-                                 const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa20_keygen(unsigned char 
k[crypto_stream_salsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa20_keygen (unsigned char
+                                   k[crypto_stream_salsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa2012.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa2012.h
index 6c5d303..66545d1 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa2012.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa2012.h
@@ -21,30 +21,32 @@ extern "C" {
 
 #define crypto_stream_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_keybytes(void);
+size_t crypto_stream_salsa2012_keybytes (void);
 
 #define crypto_stream_salsa2012_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_noncebytes(void);
+size_t crypto_stream_salsa2012_noncebytes (void);
 
 #define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_salsa2012_messagebytes_max(void);
+size_t crypto_stream_salsa2012_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_salsa2012_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa2012_keygen(unsigned char 
k[crypto_stream_salsa2012_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_salsa2012_keygen (unsigned char
+                                     k[crypto_stream_salsa2012_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa208.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa208.h
index d574f30..00ee015 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa208.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_salsa208.h
@@ -21,33 +21,34 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_keybytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void)
-            __attribute__ ((deprecated));
+size_t crypto_stream_salsa208_noncebytes (void)
+__attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
-    SODIUM_EXPORT
-size_t crypto_stream_salsa208_messagebytes_max(void)
-            __attribute__ ((deprecated));
+SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max (void)
+__attribute__ ((deprecated));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+int crypto_stream_salsa208_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char 
k[crypto_stream_salsa208_KEYBYTES])
-            __attribute__ ((deprecated)) __attribute__ ((nonnull));
+void crypto_stream_salsa208_keygen (unsigned char
+                                    k[crypto_stream_salsa208_KEYBYTES])
+__attribute__ ((deprecated)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xchacha20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xchacha20.h
index c4002db..a42ba70 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xchacha20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xchacha20.h
@@ -22,37 +22,39 @@ extern "C" {
 
 #define crypto_stream_xchacha20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_keybytes(void);
+size_t crypto_stream_xchacha20_keybytes (void);
 
 #define crypto_stream_xchacha20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_noncebytes(void);
+size_t crypto_stream_xchacha20_noncebytes (void);
 
 #define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xchacha20_messagebytes_max(void);
+size_t crypto_stream_xchacha20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
-                            const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20 (unsigned char *c, unsigned long long clen,
+                             const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor(unsigned char *c, const unsigned char *m,
-                                unsigned long long mlen, const unsigned char 
*n,
-                                const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor (unsigned char *c, const unsigned char *m,
+                                 unsigned long long mlen, const unsigned
+                                 char *n,
+                                 const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xchacha20_xor_ic(unsigned char *c, const unsigned char *m,
-                                   unsigned long long mlen,
-                                   const unsigned char *n, uint64_t ic,
-                                   const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xchacha20_xor_ic (unsigned char *c, const unsigned char *m,
+                                    unsigned long long mlen,
+                                    const unsigned char *n, uint64_t ic,
+                                    const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xchacha20_keygen(unsigned char 
k[crypto_stream_xchacha20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xchacha20_keygen (unsigned char
+                                     k[crypto_stream_xchacha20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xsalsa20.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xsalsa20.h
index 20034e3..60b0233 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xsalsa20.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_stream_xsalsa20.h
@@ -22,37 +22,38 @@ extern "C" {
 
 #define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_keybytes(void);
+size_t crypto_stream_xsalsa20_keybytes (void);
 
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_noncebytes(void);
+size_t crypto_stream_xsalsa20_noncebytes (void);
 
 #define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
-size_t crypto_stream_xsalsa20_messagebytes_max(void);
+size_t crypto_stream_xsalsa20_messagebytes_max (void);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20 (unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
-                               unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor (unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char 
*n,
+                                const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor_ic(unsigned char *c, const unsigned char *m,
-                                  unsigned long long mlen,
-                                  const unsigned char *n, uint64_t ic,
-                                  const unsigned char *k)
-            __attribute__ ((nonnull));
+int crypto_stream_xsalsa20_xor_ic (unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint64_t ic,
+                                   const unsigned char *k)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void crypto_stream_xsalsa20_keygen(unsigned char 
k[crypto_stream_xsalsa20_KEYBYTES])
-            __attribute__ ((nonnull));
+void crypto_stream_xsalsa20_keygen (unsigned char
+                                    k[crypto_stream_xsalsa20_KEYBYTES])
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_16.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_16.h
index 7b9c807..ec377fd 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_16.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_16.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
-size_t crypto_verify_16_bytes(void);
+size_t crypto_verify_16_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_16 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_32.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_32.h
index 9b0f452..03fa394 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_32.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_32.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
-size_t crypto_verify_32_bytes(void);
+size_t crypto_verify_32_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_32 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_64.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_64.h
index c83b730..fe18a74 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_64.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/crypto_verify_64.h
@@ -10,11 +10,11 @@ extern "C" {
 
 #define crypto_verify_64_BYTES 64U
 SODIUM_EXPORT
-size_t crypto_verify_64_bytes(void);
+size_t crypto_verify_64_bytes (void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y)
-            __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
+int crypto_verify_64 (const unsigned char *x, const unsigned char *y)
+__attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/export.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/export.h
index a0074fc..d943e3e 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/export.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/export.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_export_H
 #define sodium_export_H
 
@@ -6,7 +5,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#if !defined(__clang__) && !defined(__GNUC__)
+#if ! defined(__clang__) && ! defined(__GNUC__)
 # ifdef __attribute__
 #  undef __attribute__
 # endif
@@ -26,7 +25,7 @@
 # else
 #  if defined(__SUNPRO_C)
 #   ifndef __GNU_C__
-#    define SODIUM_EXPORT __attribute__ (visibility(__global))
+#    define SODIUM_EXPORT __attribute__ (visibility (__global))
 #   else
 #    define SODIUM_EXPORT __attribute__ __global
 #   endif
@@ -36,7 +35,7 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
-# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+# if defined(__ELF__) && ! defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
 # else
 #  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
@@ -45,13 +44,13 @@
 
 #ifndef CRYPTO_ALIGN
 # if defined(__INTEL_COMPILER) || defined(_MSC_VER)
-#  define CRYPTO_ALIGN(x) __declspec(align(x))
+#  define CRYPTO_ALIGN(x) __declspec(align (x))
 # else
-#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned (x)))
 # endif
 #endif
 
 #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
-#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+#define SODIUM_SIZE_MAX SODIUM_MIN (UINT64_MAX, SIZE_MAX)
 
 #endif
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes.h
index c83a4df..3539ac8 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_H
 #define randombytes_H
 
@@ -16,54 +15,56 @@
 extern "C" {
 #endif
 
-typedef struct randombytes_implementation {
-    const char *(*implementation_name)(void); /* required */
-    uint32_t    (*random)(void);              /* required */
-    void        (*stir)(void);                /* optional */
-    uint32_t    (*uniform)(const uint32_t upper_bound); /* optional, a default 
implementation will be used if NULL */
-    void        (*buf)(void * const buf, const size_t size); /* required */
-    int         (*close)(void);               /* optional */
+typedef struct randombytes_implementation
+{
+  const char *(*implementation_name)(void);   /* required */
+  uint32_t (*random)(void);                   /* required */
+  void (*stir)(void);                         /* optional */
+  uint32_t (*uniform)(const uint32_t upper_bound);      /* optional, a default 
implementation will be used if NULL */
+  void (*buf)(void *const buf, const size_t size);           /* required */
+  int (*close)(void);                         /* optional */
 } randombytes_implementation;
 
-#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+#define randombytes_BYTES_MAX SODIUM_MIN (SODIUM_SIZE_MAX, 0xffffffffUL)
 
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
-size_t randombytes_seedbytes(void);
+size_t randombytes_seedbytes (void);
 
 SODIUM_EXPORT
-void randombytes_buf(void * const buf, const size_t size)
-            __attribute__ ((nonnull));
+void randombytes_buf (void *const buf, const size_t size)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-void randombytes_buf_deterministic(void * const buf, const size_t size,
-                                   const unsigned char 
seed[randombytes_SEEDBYTES])
-            __attribute__ ((nonnull));
+void randombytes_buf_deterministic (void *const buf, const size_t size,
+                                    const unsigned char
+                                    seed[randombytes_SEEDBYTES])
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-uint32_t randombytes_random(void);
+uint32_t randombytes_random (void);
 
 SODIUM_EXPORT
-uint32_t randombytes_uniform(const uint32_t upper_bound);
+uint32_t randombytes_uniform (const uint32_t upper_bound);
 
 SODIUM_EXPORT
-void randombytes_stir(void);
+void randombytes_stir (void);
 
 SODIUM_EXPORT
-int randombytes_close(void);
+int randombytes_close (void);
 
 SODIUM_EXPORT
-int randombytes_set_implementation(const randombytes_implementation *impl)
-            __attribute__ ((nonnull));
+int randombytes_set_implementation (const randombytes_implementation *impl)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-const char *randombytes_implementation_name(void);
+const char *randombytes_implementation_name (void);
 
 /* -- NaCl compatibility interface -- */
 
 SODIUM_EXPORT
-void randombytes(unsigned char * const buf, const unsigned long long buf_len)
-            __attribute__ ((nonnull));
+void randombytes (unsigned char *const buf, const unsigned long long buf_len)
+__attribute__ ((nonnull));
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_internal_random.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_internal_random.h
index 2b2b7d6..d9cd6b0 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_internal_random.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_internal_random.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_internal_random_H
 #define randombytes_internal_random_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_sysrandom.h
 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_sysrandom.h
index 9e27b67..ebb284f 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_sysrandom.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/randombytes_sysrandom.h
@@ -1,4 +1,3 @@
-
 #ifndef randombytes_sysrandom_H
 #define randombytes_sysrandom_H
 
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/runtime.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/runtime.h
index c1cec85..471d71b 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/runtime.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/runtime.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_runtime_H
 #define sodium_runtime_H
 
@@ -9,44 +8,44 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_neon(void);
+int sodium_runtime_has_neon (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_armcrypto(void);
+int sodium_runtime_has_armcrypto (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse2(void);
+int sodium_runtime_has_sse2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse3(void);
+int sodium_runtime_has_sse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_ssse3(void);
+int sodium_runtime_has_ssse3 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_sse41(void);
+int sodium_runtime_has_sse41 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx(void);
+int sodium_runtime_has_avx (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx2(void);
+int sodium_runtime_has_avx2 (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_avx512f(void);
+int sodium_runtime_has_avx512f (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_pclmul(void);
+int sodium_runtime_has_pclmul (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_aesni(void);
+int sodium_runtime_has_aesni (void);
 
 SODIUM_EXPORT_WEAK
-int sodium_runtime_has_rdrand(void);
+int sodium_runtime_has_rdrand (void);
 
 /* ------------------------------------------------------------------------- */
 
-int _sodium_runtime_get_cpu_features(void);
+int _sodium_runtime_get_cpu_features (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/utils.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/utils.h
index f9b3697..39b121d 100644
--- a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/utils.h
+++ b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/utils.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_utils_H
 #define sodium_utils_H
 
@@ -11,7 +10,8 @@ extern "C" {
 #endif
 
 #ifndef SODIUM_C99
-# if defined(__cplusplus) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 
199901L
+# if defined(__cplusplus) || ! defined(__STDC_VERSION__) || __STDC_VERSION__ < 
\
+  199901L
 #  define SODIUM_C99(X)
 # else
 #  define SODIUM_C99(X) X
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-void sodium_memzero(void * const pnt, const size_t len);
+void sodium_memzero (void *const pnt, const size_t len);
 
 SODIUM_EXPORT
-void sodium_stackzero(const size_t len);
+void sodium_stackzero (const size_t len);
 
 /*
  * WARNING: sodium_memcmp() must be used to verify if two secret keys
@@ -31,8 +31,8 @@ void sodium_stackzero(const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
-            __attribute__ ((warn_unused_result));
+int sodium_memcmp (const void *const b1_, const void *const b2_, size_t len)
+__attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -41,32 +41,32 @@ int sodium_memcmp(const void * const b1_, const void * 
const b2_, size_t len)
  * However, it is slower than sodium_memcmp().
  */
 SODIUM_EXPORT
-int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len) __attribute__ ((warn_unused_result));
+int sodium_compare (const unsigned char *b1_, const unsigned char *b2_,
+                    size_t len) __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
-int sodium_is_zero(const unsigned char *n, const size_t nlen);
+int sodium_is_zero (const unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_increment(unsigned char *n, const size_t nlen);
+void sodium_increment (unsigned char *n, const size_t nlen);
 
 SODIUM_EXPORT
-void sodium_add(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_add (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-void sodium_sub(unsigned char *a, const unsigned char *b, const size_t len);
+void sodium_sub (unsigned char *a, const unsigned char *b, const size_t len);
 
 SODIUM_EXPORT
-char *sodium_bin2hex(char * const hex, const size_t hex_maxlen,
-                     const unsigned char * const bin, const size_t bin_len)
-            __attribute__ ((nonnull(1)));
+char *sodium_bin2hex (char *const hex, const size_t hex_maxlen,
+                      const unsigned char *const bin, const size_t bin_len)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
-                   const char * const hex, const size_t hex_len,
-                   const char * const ignore, size_t * const bin_len,
-                   const char ** const hex_end)
-            __attribute__ ((nonnull(1)));
+int sodium_hex2bin (unsigned char *const bin, const size_t bin_maxlen,
+                    const char *const hex, const size_t hex_len,
+                    const char *const ignore, size_t *const bin_len,
+                    const char **const hex_end)
+__attribute__ ((nonnull(1)));
 
 #define sodium_base64_VARIANT_ORIGINAL            1
 #define sodium_base64_VARIANT_ORIGINAL_NO_PADDING 3
@@ -78,32 +78,35 @@ int sodium_hex2bin(unsigned char * const bin, const size_t 
bin_maxlen,
  * using the given variant. The computed length includes a trailing \0.
  */
 #define sodium_base64_ENCODED_LEN(BIN_LEN, VARIANT) \
-    (((BIN_LEN) / 3U) * 4U + \
-    ((((BIN_LEN) - ((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) - ((BIN_LEN) / 3U) * 
3U) >> 1)) & 1U) * \
-     (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) - ((BIN_LEN) / 
3U) * 3U)))) + 1U)
+  (((BIN_LEN) / 3U) * 4U   \
+   + ((((BIN_LEN) -((BIN_LEN) / 3U) * 3U) | (((BIN_LEN) -((BIN_LEN) / 3U) \
+                                              * 3U) >> 1)) & 1U)   \
+   * (4U - (~((((VARIANT) & 2U) >> 1) - 1U) & (3U - ((BIN_LEN) -((BIN_LEN) \
+                                                                 / 3U) \
+                                                     * 3U)))) + 1U)
 
 SODIUM_EXPORT
-size_t sodium_base64_encoded_len(const size_t bin_len, const int variant);
+size_t sodium_base64_encoded_len (const size_t bin_len, const int variant);
 
 SODIUM_EXPORT
-char *sodium_bin2base64(char * const b64, const size_t b64_maxlen,
-                        const unsigned char * const bin, const size_t bin_len,
-                        const int variant) __attribute__ ((nonnull(1)));
+char *sodium_bin2base64 (char *const b64, const size_t b64_maxlen,
+                         const unsigned char *const bin, const size_t bin_len,
+                         const int variant) __attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_base642bin(unsigned char * const bin, const size_t bin_maxlen,
-                      const char * const b64, const size_t b64_len,
-                      const char * const ignore, size_t * const bin_len,
-                      const char ** const b64_end, const int variant)
-            __attribute__ ((nonnull(1)));
+int sodium_base642bin (unsigned char *const bin, const size_t bin_maxlen,
+                       const char *const b64, const size_t b64_len,
+                       const char *const ignore, size_t *const bin_len,
+                       const char **const b64_end, const int variant)
+__attribute__ ((nonnull(1)));
 
 SODIUM_EXPORT
-int sodium_mlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_mlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_munlock(void * const addr, const size_t len)
-            __attribute__ ((nonnull));
+int sodium_munlock (void *const addr, const size_t len)
+__attribute__ ((nonnull));
 
 /* WARNING: sodium_malloc() and sodium_allocarray() are not general-purpose
  * allocation functions.
@@ -139,38 +142,38 @@ int sodium_munlock(void * const addr, const size_t len)
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size)
-            __attribute__ ((malloc));
+void *sodium_malloc (const size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size)
-            __attribute__ ((malloc));
+void *sodium_allocarray (size_t count, size_t size)
+__attribute__ ((malloc));
 
 SODIUM_EXPORT
-void sodium_free(void *ptr);
+void sodium_free (void *ptr);
 
 SODIUM_EXPORT
-int sodium_mprotect_noaccess(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_noaccess (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readonly(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readonly (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_mprotect_readwrite(void *ptr) __attribute__ ((nonnull));
+int sodium_mprotect_readwrite (void *ptr) __attribute__ ((nonnull));
 
 SODIUM_EXPORT
-int sodium_pad(size_t *padded_buflen_p, unsigned char *buf,
-               size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
-            __attribute__ ((nonnull(2)));
+int sodium_pad (size_t *padded_buflen_p, unsigned char *buf,
+                size_t unpadded_buflen, size_t blocksize, size_t max_buflen)
+__attribute__ ((nonnull(2)));
 
 SODIUM_EXPORT
-int sodium_unpad(size_t *unpadded_buflen_p, const unsigned char *buf,
-                 size_t padded_buflen, size_t blocksize)
-            __attribute__ ((nonnull(2)));
+int sodium_unpad (size_t *unpadded_buflen_p, const unsigned char *buf,
+                  size_t padded_buflen, size_t blocksize)
+__attribute__ ((nonnull(2)));
 
 /* -------- */
 
-int _sodium_alloc_init(void);
+int _sodium_alloc_init (void);
 
 #ifdef __cplusplus
 }
diff --git 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/version.h 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/version.h
index 022ab11..cec1b92 100644
--- 
a/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/version.h
+++ 
b/verification-app/app/src/main/cpp/libsodium/x86_64/include/sodium/version.h
@@ -1,4 +1,3 @@
-
 #ifndef sodium_version_H
 #define sodium_version_H
 
@@ -15,16 +14,16 @@ extern "C" {
 #endif
 
 SODIUM_EXPORT
-const char *sodium_version_string(void);
+const char *sodium_version_string (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_major(void);
+int         sodium_library_version_major (void);
 
 SODIUM_EXPORT
-int         sodium_library_version_minor(void);
+int         sodium_library_version_minor (void);
 
 SODIUM_EXPORT
-int         sodium_library_minimal(void);
+int         sodium_library_minimal (void);
 
 #ifdef __cplusplus
 }
diff --git a/verification-app/app/src/main/cpp/verification.cpp 
b/verification-app/app/src/main/cpp/verification.cpp
index ca94c12..f25c808 100644
--- a/verification-app/app/src/main/cpp/verification.cpp
+++ b/verification-app/app/src/main/cpp/verification.cpp
@@ -1,3 +1,19 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2024 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation; either version 3, or (at your option) any later version.
+
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+
 #include <jni.h>
 #include <string>
 #include <android/log.h>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]