From c524c7a14b0a771f0daabc38b32dc1ee490a0159 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 15 Jun 2023 17:15:51 +0200
Subject: [PATCH] Revert "Leverage aegis*_absorb() when no message is desired"

This reverts commit 2c56be1d77730a632d9b6f1c191d48a6ae0f0bb3.
---
 .../crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c          | 2 +-
 .../crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c  | 2 +-
 src/libsodium/crypto_aead/aegis128l/soft/aead_aegis128l_soft.c  | 2 +-
 src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c  | 2 +-
 .../crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c    | 2 +-
 src/libsodium/crypto_aead/aegis256/soft/aead_aegis256_soft.c    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c b/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c
index bf7ad83f..8f0844c8 100644
--- a/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c
+++ b/src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c
@@ -229,7 +229,7 @@ aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 32ULL <= mlen; i += 32ULL) {
-            aegis128l_absorb(c + i, state);
+            aegis128l_dec(dst, c + i, state);
         }
     }
     if (mlen & 0x1f) {
diff --git a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
index ae2c396f..de7aa4dc 100644
--- a/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
+++ b/src/libsodium/crypto_aead/aegis128l/armcrypto/aead_aegis128l_armcrypto.c
@@ -219,7 +219,7 @@ aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 32ULL <= mlen; i += 32ULL) {
-            aegis128l_absorb(c + i, state);
+            aegis128l_dec(dst, c + i, state);
         }
     }
     if (mlen & 0x1f) {
diff --git a/src/libsodium/crypto_aead/aegis128l/soft/aead_aegis128l_soft.c b/src/libsodium/crypto_aead/aegis128l/soft/aead_aegis128l_soft.c
index 85270eda..81081384 100644
--- a/src/libsodium/crypto_aead/aegis128l/soft/aead_aegis128l_soft.c
+++ b/src/libsodium/crypto_aead/aegis128l/soft/aead_aegis128l_soft.c
@@ -222,7 +222,7 @@ aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 32ULL <= mlen; i += 32ULL) {
-            aegis128l_absorb(c + i, state);
+            aegis128l_dec(dst, c + i, state);
         }
     }
     if (mlen & 0x1f) {
diff --git a/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c b/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c
index 231b227e..69e20d39 100644
--- a/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c
+++ b/src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c
@@ -219,7 +219,7 @@ aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 16ULL <= mlen; i += 16ULL) {
-            aegis256_absorb(c + i, state);
+            aegis256_dec(dst, c + i, state);
         }
     }
     if (mlen & 0xf) {
diff --git a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
index ef893ac5..5d934a80 100644
--- a/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
+++ b/src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
@@ -214,7 +214,7 @@ aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 16ULL <= mlen; i += 16ULL) {
-            aegis256_absorb(c + i, state);
+            aegis256_dec(dst, c + i, state);
         }
     }
     if (mlen & 0xf) {
diff --git a/src/libsodium/crypto_aead/aegis256/soft/aead_aegis256_soft.c b/src/libsodium/crypto_aead/aegis256/soft/aead_aegis256_soft.c
index 8260a21b..48c0b123 100644
--- a/src/libsodium/crypto_aead/aegis256/soft/aead_aegis256_soft.c
+++ b/src/libsodium/crypto_aead/aegis256/soft/aead_aegis256_soft.c
@@ -211,7 +211,7 @@ aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, const unsigned
         }
     } else {
         for (i = 0ULL; i + 16ULL <= mlen; i += 16ULL) {
-            aegis256_absorb(c + i, state);
+            aegis256_dec(dst, c + i, state);
         }
     }
     if (mlen & 0xf) {