Speed up AEAD on wrong prekey

firoorg · Dec 19, 2023 · a6a1c20 · a6a1c20
1 parent 78e7d1e
commit a6a1c20
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/libspark/aead.cpp b/src/libspark/aead.cpp
@@ -44,15 +44,15 @@ AEADEncryptedData AEAD::encrypt(const GroupElement& prekey, const std::string ad
 
 // Perform authenticated decryption with ChaCha20-Poly1305 using key commitment
 CDataStream AEAD::decrypt_and_verify(const GroupElement& prekey, const std::string additional_data, AEADEncryptedData& data) {
-	// Derive the key and commitment
-	std::vector<unsigned char> key = SparkUtils::kdf_aead(prekey);
-	std::vector<unsigned char> key_commitment = SparkUtils::commit_aead(prekey);
-
 	// Assert that the key commitment is valid
+	std::vector<unsigned char> key_commitment = SparkUtils::commit_aead(prekey);
 	if (key_commitment != data.key_commitment) {
 		throw std::runtime_error("Bad AEAD key commitment");
 	}
 
+	// Derive the key
+	std::vector<unsigned char> key = SparkUtils::kdf_aead(prekey);
+
 	// Set up the result
 	CDataStream result(SER_NETWORK, PROTOCOL_VERSION);