commit facc6ff39e129984d6b03cb16716f449cdacbbdb
author Adam Langley <agl@google.com> Wed Jun 25 20:45:06 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 25 10:31:48 2014 +0000
tree 8b4e1228ef4fb4d36d5e2b783f0193fa1dc09330
parent 3f6fa3db62c781768b567c6f02814c0d6d27fe7f
parent d54dc249ead32282d4d1d5588a24822752d92a51

Merge "Run AEAD test cases at the end of a file."

crypto/cipher/aead_test.c

diff --git a/crypto/cipher/aead_test.c b/crypto/cipher/aead_test.c
index 0e934cd..7e40147 100644
--- a/crypto/cipher/aead_test.c
+++ b/crypto/cipher/aead_test.c
@@ -171,7 +171,7 @@
     unsigned int *buf_len = NULL;
 
     if (!fgets(line, sizeof(line), f)) {
-      break;
+      line[0] = 0;
     }
 
     line_no++;
@@ -189,19 +189,21 @@
         }
       }
 
-      if (!any_values_set) {
-        continue;
+      if (any_values_set) {
+        if (!run_test_case(aead, bufs, lengths, line_no)) {
+          return 4;
+        }
+
+        for (j = 0; j < NUM_TYPES; j++) {
+          lengths[j] = 0;
+        }
+
+        num_tests++;
       }
 
-      if (!run_test_case(aead, bufs, lengths, line_no)) {
-        return 4;
+      if (line[0] == 0) {
+        break;
       }
-
-      for (j = 0; j < NUM_TYPES; j++) {
-        lengths[j] = 0;
-      }
-
-      num_tests++;
       continue;
     }