Convert example_mul to GTest. This is the last of the non-GTest tests. We never did end up writing example files or doc.go tooling for them. And probably examples should be in C++ at this point. Bug: 129 Change-Id: Icbc43c9639cfed7423df20df1cdcb8c35f23fc1a Reviewed-on: https://boringssl-review.googlesource.com/17669 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt index a1bc6dc..e83c483 100644 --- a/crypto/fipsmodule/CMakeLists.txt +++ b/crypto/fipsmodule/CMakeLists.txt
@@ -193,14 +193,3 @@ ${BCM_ASM_SOURCES} ) endif() - -add_executable( - example_mul - - ec/example_mul.c - - $<TARGET_OBJECTS:test_support> -) - -target_link_libraries(example_mul crypto) -add_dependencies(all_tests example_mul)
diff --git a/crypto/fipsmodule/ec/ec_test.cc b/crypto/fipsmodule/ec/ec_test.cc index 71f9fd8..48b60ee 100644 --- a/crypto/fipsmodule/ec/ec_test.cc +++ b/crypto/fipsmodule/ec/ec_test.cc
@@ -380,6 +380,31 @@ << "p * 0 did not return point at infinity."; } +// Test that 10×∞ + G = G. +TEST_P(ECCurveTest, Mul) { + bssl::UniquePtr<EC_GROUP> group(EC_GROUP_new_by_curve_name(GetParam().nid)); + ASSERT_TRUE(group); + bssl::UniquePtr<EC_POINT> p(EC_POINT_new(group.get())); + ASSERT_TRUE(p); + bssl::UniquePtr<EC_POINT> result(EC_POINT_new(group.get())); + ASSERT_TRUE(result); + bssl::UniquePtr<BIGNUM> n(BN_new()); + ASSERT_TRUE(n); + ASSERT_TRUE(EC_POINT_set_to_infinity(group.get(), p.get())); + ASSERT_TRUE(BN_set_word(n.get(), 10)); + + // First check that 10×∞ = ∞. + ASSERT_TRUE(EC_POINT_mul(group.get(), result.get(), nullptr, p.get(), n.get(), + nullptr)); + EXPECT_TRUE(EC_POINT_is_at_infinity(group.get(), result.get())); + + // Now check that 10×∞ + G = G. + const EC_POINT *generator = EC_GROUP_get0_generator(group.get()); + ASSERT_TRUE(EC_POINT_mul(group.get(), result.get(), BN_value_one(), p.get(), + n.get(), nullptr)); + EXPECT_EQ(0, EC_POINT_cmp(group.get(), result.get(), generator, nullptr)); +} + static std::vector<EC_builtin_curve> AllCurves() { const size_t num_curves = EC_get_builtin_curves(nullptr, 0); std::vector<EC_builtin_curve> curves(num_curves);
diff --git a/crypto/fipsmodule/ec/example_mul.c b/crypto/fipsmodule/ec/example_mul.c deleted file mode 100644 index a2bdd52..0000000 --- a/crypto/fipsmodule/ec/example_mul.c +++ /dev/null
@@ -1,133 +0,0 @@ -/* Originally written by Bodo Moeller for the OpenSSL project. - * ==================================================================== - * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * - * Portions of the attached software ("Contribution") are developed by - * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project. - * - * The Contribution is licensed pursuant to the OpenSSL open source - * license provided above. - * - * The elliptic curve binary polynomial software is originally written by - * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems - * Laboratories. */ - -#include <stdio.h> - -#include <openssl/bn.h> -#include <openssl/crypto.h> -#include <openssl/ec.h> -#include <openssl/nid.h> - - -static int example_EC_POINT_mul(void) { - /* This example ensures that 10×∞ + G = G, in P-256. */ - EC_GROUP *group = NULL; - EC_POINT *p = NULL, *result = NULL; - BIGNUM *n = NULL; - int ret = 0; - const EC_POINT *generator; - - group = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1); - p = EC_POINT_new(group); - result = EC_POINT_new(group); - n = BN_new(); - - if (p == NULL || - result == NULL || - group == NULL || - n == NULL || - !EC_POINT_set_to_infinity(group, p) || - !BN_set_word(n, 10)) { - goto err; - } - - /* First check that 10×∞ = ∞. */ - if (!EC_POINT_mul(group, result, NULL, p, n, NULL) || - !EC_POINT_is_at_infinity(group, result)) { - goto err; - } - - generator = EC_GROUP_get0_generator(group); - - /* Now check that 10×∞ + G = G. */ - if (!EC_POINT_mul(group, result, BN_value_one(), p, n, NULL) || - EC_POINT_cmp(group, result, generator, NULL) != 0) { - goto err; - } - - ret = 1; - -err: - BN_free(n); - EC_POINT_free(result); - EC_POINT_free(p); - EC_GROUP_free(group); - - return ret; -} - -int main(void) { - CRYPTO_library_init(); - - if (!example_EC_POINT_mul()) { - fprintf(stderr, "failed\n"); - return 1; - } - - printf("PASS\n"); - return 0; -}
diff --git a/util/all_tests.json b/util/all_tests.json index cb66fed..01d6fd0 100644 --- a/util/all_tests.json +++ b/util/all_tests.json
@@ -1,6 +1,5 @@ [ ["crypto/crypto_test"], - ["crypto/fipsmodule/example_mul"], ["decrepit/decrepit_test"], ["ssl/ssl_test"] ]