Echo CAVP comments in the output.
Comments in CAVP are semantically important and we need to copy them
from the input to the output.
Change-Id: Ib798c4ad79de924487d0c4a0f8fc16b757e766d8
Reviewed-on: https://boringssl-review.googlesource.com/16725
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/fipstools/cavp_aes_test.cc b/fipstools/cavp_aes_test.cc
index ad1d50c..6c0cf3c 100644
--- a/fipstools/cavp_aes_test.cc
+++ b/fipstools/cavp_aes_test.cc
@@ -217,11 +217,11 @@
TestCtx ctx = {cipher, has_iv, test_mode};
- printf("# Generated by");
- for (int i = 0; i < argc; i++) {
- printf(" %s", argv[i]);
- }
- printf("\r\n\r\n");
-
- return FileTestMainSilent(TestCipher, &ctx, argv[3]);
+ FileTest::Options opts;
+ opts.path = argv[3];
+ opts.callback = TestCipher;
+ opts.arg = &ctx;
+ opts.silent = true;
+ opts.comment_callback = EchoComment;
+ return FileTestMain(opts);
}