From 9feaa28d824bd2ee18e3a8caec9e1d366d230924 Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Sun, 9 Jan 2022 18:42:52 +0100 Subject: [PATCH] Spelled libsodium with lowercase Just conforming to the original documentation. --- CHANGELOG.md | 2 +- README.md | 10 +++++----- tests/gen/makefile | 2 +- tests/gen/x25519.c | 2 +- tests/speed/speed-sodium.c | 4 ++-- tests/tis-ci-vectors.h | 2 +- tests/utils.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddbf926..1662408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,7 +118,7 @@ - Changed the authenticated encryption format. It now conforms to RFC 7539, with one exception: it uses XChacha20 initialisation instead of the IETF version of Chacha20. This new format conforms to - Libsodium's `crypto_aead_xchacha20poly1305_ietf_encrypt`. + libsodium's `crypto_aead_xchacha20poly1305_ietf_encrypt`. - Removed `crypto_lock_encrypt()` and `crypto_lock_auth()`. - Renamed `crypto_lock_aead_auth()` to `crypto_lock_auth_ad()`. - Renamed `crypto_unlock_aead_auth()` to `crypto_unlock_auth_ad()`. diff --git a/README.md b/README.md index 5ef3106..0e1a82d 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ the notes at the end.)_ Monocypher is an easy to use, easy to deploy, auditable crypto library written in portable C. It approaches the size of [TweetNaCl][] and the -speed of [Libsodium][]. +speed of [libsodium][]. [Official site.](https://monocypher.org/) [Official releases.](https://monocypher.org/download/) -[Libsodium]: https://libsodium.org +[libsodium]: https://libsodium.org [TweetNaCl]: https://tweetnacl.cr.yp.to/ @@ -160,14 +160,14 @@ Speed benchmark This will give you an idea how fast Monocypher is on your machine. Make sure you run it on the target platform if performance is a concern. If -Monocypher is too slow, try Libsodium. If you're not sure, you can +Monocypher is too slow, try libsodium. If you're not sure, you can always switch later. Note: the speed benchmark currently requires the POSIX `clock_gettime()` function. -There are similar benchmarks for Libsodium, TweetNaCl, LibHydrogen, +There are similar benchmarks for libsodium, TweetNaCl, LibHydrogen, c25519, and ed25519-donna (the portable, 32-bit version): $ make speed-sodium @@ -219,7 +219,7 @@ Contributor notes If you are reading this, you cloned the GitHub repository. You miss a couple files that ship with the tarball releases: -- The `tests/vectors.h` header. Generating it requires Libsodium. Go +- The `tests/vectors.h` header. Generating it requires libsodium. Go to `tests/gen/`, then run `make`. - The html version of the manual, generated by the `doc/man2html.sh` script. You will need mandoc. diff --git a/tests/gen/makefile b/tests/gen/makefile index f01fdad..685d2ea 100644 --- a/tests/gen/makefile +++ b/tests/gen/makefile @@ -135,7 +135,7 @@ $(VEC2): prelude.h.vec: @echo "creating prelude.h.vec" @echo "// Generated with hard coded official vectors, and" > $@ - @echo "// random vectors with Libsodium and ed25519-donna." >> $@ + @echo "// random vectors with libsodium and ed25519-donna." >> $@ @echo "// Download Monocypher's git repository to regenerate." >> $@ @echo "#include " >> $@ @echo "#include " >> $@ diff --git a/tests/gen/x25519.c b/tests/gen/x25519.c index e0a21a1..c0fb779 100644 --- a/tests/gen/x25519.c +++ b/tests/gen/x25519.c @@ -61,7 +61,7 @@ static void test() crypto_scalarmult_base(pk1, sk1); crypto_scalarmult_base(pk2, sk2); if (crypto_scalarmult(shared, sk1, pk2)) { - fprintf(stderr, "Libsodium rejected the public key\n"); + fprintf(stderr, "libsodium rejected the public key\n"); printf(":deadbeef:\n"); // prints a canary to fail subsequent tests } diff --git a/tests/speed/speed-sodium.c b/tests/speed/speed-sodium.c index 113992a..8111cba 100644 --- a/tests/speed/speed-sodium.c +++ b/tests/speed/speed-sodium.c @@ -137,7 +137,7 @@ static u64 x25519(void) TIMING_START { if (crypto_scalarmult(out, out, in)) { - fprintf(stderr, "Libsodium rejected the public key\n"); + fprintf(stderr, "libsodium rejected the public key\n"); } } TIMING_END; @@ -168,7 +168,7 @@ static u64 edDSA_check(void) TIMING_START { if (crypto_sign_verify_detached(signature, message, 64, pk)) { - printf("Libsodium verification failed\n"); + printf("libsodium verification failed\n"); } } TIMING_END; diff --git a/tests/tis-ci-vectors.h b/tests/tis-ci-vectors.h index 01f19c4..f3146a3 100644 --- a/tests/tis-ci-vectors.h +++ b/tests/tis-ci-vectors.h @@ -1,5 +1,5 @@ // Generated with hard coded official vectors, and -// random vectors with Libsodium and ed25519-donna. +// random vectors with libsodium and ed25519-donna. // Download Monocypher's git repository to regenerate. #include #include diff --git a/tests/utils.h b/tests/utils.h index cdeb37e..8040ae0 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -66,7 +66,7 @@ typedef uint64_t u64; #define SODIUM_INIT \ do { \ if (sodium_init() == -1) { \ - printf("Libsodium init failed. Abort.\n"); \ + printf("libsodium init failed. Abort.\n"); \ return 1; \ } \ } while (0) -- 2.47.3