906bbef001
This CL updates the JSON conversion to preserve the flags. A WycheproofResult now captures both "result" and "flags". An "acceptable" test case's validity is determined by its flags. By default, we consider an "acceptable" case as invalid, but a test driver may mark some of them as valid by listing the flags as a parameter. Previously, some Wycheproof tests (I think it was x25519_tests.txt?) did not contain enough information to resolve this unambiguously. This has since been fixed. This also makes the converted files smaller because we no longer expand the flags into comments. Change-Id: I2ca02d7f1b95f250409e8b23c4ad7bb595d77fdf Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/39188 Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com>
64 lines
2.3 KiB
C++
64 lines
2.3 KiB
C++
/* Copyright (c) 2018, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
#ifndef OPENSSL_HEADER_CRYPTO_TEST_WYCHEPROOF_UTIL_H
|
|
#define OPENSSL_HEADER_CRYPTO_TEST_WYCHEPROOF_UTIL_H
|
|
|
|
#include <openssl/base.h>
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
|
|
// This header contains convenience functions for Wycheproof tests.
|
|
|
|
class FileTest;
|
|
|
|
enum class WycheproofRawResult {
|
|
kValid,
|
|
kInvalid,
|
|
kAcceptable,
|
|
};
|
|
|
|
struct WycheproofResult {
|
|
WycheproofRawResult raw_result;
|
|
std::vector<std::string> flags;
|
|
|
|
// IsValid returns true if the Wycheproof test should be considered valid. A
|
|
// test result of "acceptable" is treated as valid if all flags are included
|
|
// in |acceptable_flags| and invalid otherwise.
|
|
bool IsValid(const std::vector<std::string> &acceptable_flags = {}) const;
|
|
};
|
|
|
|
// GetWycheproofResult sets |*out| to the parsed "result" and "flags" keys of |t|.
|
|
bool GetWycheproofResult(FileTest *t, WycheproofResult *out);
|
|
|
|
// GetWycheproofDigest returns a digest function using the Wycheproof name, or
|
|
// nullptr on error.
|
|
const EVP_MD *GetWycheproofDigest(FileTest *t, const char *key,
|
|
bool instruction);
|
|
|
|
// GetWycheproofCurve returns a curve using the Wycheproof name, or nullptr on
|
|
// error.
|
|
bssl::UniquePtr<EC_GROUP> GetWycheproofCurve(FileTest *t, const char *key,
|
|
bool instruction);
|
|
|
|
// GetWycheproofBIGNUM returns a BIGNUM in the Wycheproof format, or nullptr on
|
|
// error.
|
|
bssl::UniquePtr<BIGNUM> GetWycheproofBIGNUM(FileTest *t, const char *key,
|
|
bool instruction);
|
|
|
|
|
|
#endif // OPENSSL_HEADER_CRYPTO_TEST_WYCHEPROOF_UTIL_H
|