1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 18:15:18 -07:00

Merge branch 'master' of github.com:jedisct1/libsodium into master

* 'master' of github.com:jedisct1/libsodium:
  docs: fix simple typo, interoperatibility -> interoperability (#1002)
  Repair AEGIS on aarch64
This commit is contained in:
Frank Denis 2020-10-12 11:51:13 +02:00
commit 82652f0a0b
5 changed files with 8 additions and 8 deletions

View File

@ -63,9 +63,9 @@ crypto_aead_aegis128l_init(const unsigned char *key, const unsigned char *nonce,
state[2] = c2; state[2] = c2;
state[3] = c1; state[3] = c1;
state[4] = veorq_u8(k, n); state[4] = veorq_u8(k, n);
state[5] = veorq_u8(k1, c2); state[5] = veorq_u8(k, c2);
state[6] = veorq_u8(k1, c1); state[6] = veorq_u8(k, c1);
state[7] = veorq_u8(k1, c2); state[7] = veorq_u8(k, c2);
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
crypto_aead_aegis128l_update(state, n, k); crypto_aead_aegis128l_update(state, n, k);
} }

View File

@ -51,8 +51,8 @@ crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *nonce,
k1 = vld1q_u8(&key[0]); k1 = vld1q_u8(&key[0]);
k2 = vld1q_u8(&key[16]); k2 = vld1q_u8(&key[16]);
kxn3 = veorq_u8(k1, vld1q_u8(&nonce[0])); kxn1 = veorq_u8(k1, vld1q_u8(&nonce[0]));
kxn4 = veorq_u8(k2, vld1q_u8(&nonce[16])); kxn2 = veorq_u8(k2, vld1q_u8(&nonce[16]));
state[0] = kxn1; state[0] = kxn1;
state[1] = kxn2; state[1] = kxn2;

View File

@ -2,7 +2,7 @@
#define crypto_hash_H #define crypto_hash_H
/* /*
* WARNING: Unless you absolutely need to use SHA512 for interoperatibility, * WARNING: Unless you absolutely need to use SHA512 for interoperability,
* purposes, you might want to consider crypto_generichash() instead. * purposes, you might want to consider crypto_generichash() instead.
* Unlike SHA512, crypto_generichash() is not vulnerable to length * Unlike SHA512, crypto_generichash() is not vulnerable to length
* extension attacks. * extension attacks.

View File

@ -2,7 +2,7 @@
#define crypto_hash_sha256_H #define crypto_hash_sha256_H
/* /*
* WARNING: Unless you absolutely need to use SHA256 for interoperatibility, * WARNING: Unless you absolutely need to use SHA256 for interoperability,
* purposes, you might want to consider crypto_generichash() instead. * purposes, you might want to consider crypto_generichash() instead.
* Unlike SHA256, crypto_generichash() is not vulnerable to length * Unlike SHA256, crypto_generichash() is not vulnerable to length
* extension attacks. * extension attacks.

View File

@ -2,7 +2,7 @@
#define crypto_hash_sha512_H #define crypto_hash_sha512_H
/* /*
* WARNING: Unless you absolutely need to use SHA512 for interoperatibility, * WARNING: Unless you absolutely need to use SHA512 for interoperability,
* purposes, you might want to consider crypto_generichash() instead. * purposes, you might want to consider crypto_generichash() instead.
* Unlike SHA512, crypto_generichash() is not vulnerable to length * Unlike SHA512, crypto_generichash() is not vulnerable to length
* extension attacks. * extension attacks.