commit de58e605fe26391833c883f1927f7f4cdc226e5b
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Feb 17 23:09:02 2021 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Feb 17 23:09:02 2021 -0800
tree c63c9575bf89a1ebc002c0108536e3998e0d6bbc
parent 6499eddd8a2cdedfc99a8aef21b49dc53ef15e98

fix some more issues mentioned by Junxiao

Change-Id: I811d724497d887e5fdfc50e02c05033935490f23

src/detail/crypto-helpers.cpp

diff --git a/src/detail/crypto-helpers.cpp b/src/detail/crypto-helpers.cpp
index 4629050..4ee887d 100644
--- a/src/detail/crypto-helpers.cpp
+++ b/src/detail/crypto-helpers.cpp
@@ -395,15 +395,23 @@
   block.parse();
   const auto& encryptedPayloadBlock = block.get(tlv::EncryptedPayload);
   Buffer result(encryptedPayloadBlock.value_size());
-  std::vector<uint8_t> currentIv(block.get(tlv::InitializationVector).value(), block.get(tlv::InitializationVector).value() + 12);
+  if (block.get(tlv::InitializationVector).value_size() != 12 || block.get(tlv::AuthenticationTag).value_size() != 16) {
+    NDN_THROW(std::runtime_error("Error when decrypting the AES Encrypted Block: "
+                                 "The observed IV or Authentication Tag is incorrectly formed."));
+  }
+  std::vector<uint8_t> currentIv(block.get(tlv::InitializationVector).value(),
+                                 block.get(tlv::InitializationVector).value() + 12);
   if (decryptionIv.empty()) {
     decryptionIv = currentIv;
   }
   else {
-    if (currentIv != decryptionIv) {
+    if (loadBigU32(currentIv, 8) < loadBigU32(decryptionIv, 8)) {
       NDN_THROW(std::runtime_error("Error when decrypting the AES Encrypted Block: "
                                    "The observed IV is incorrectly formed."));
     }
+    else {
+      decryptionIv = currentIv;
+    }
   }
   auto resultLen = aesGcm128Decrypt(encryptedPayloadBlock.value(), encryptedPayloadBlock.value_size(),
                                     associatedData, associatedDataSize, block.get(tlv::AuthenticationTag).value(),