From f017b749ea9f1586d2308504553d40bf4cc5439d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 6 Feb 2018 11:46:26 +0100 Subject: Update NSS to 3.32.1-RTM --- security/nss/gtests/certdb_gtest/Makefile | 43 ++++++++++ .../nss/gtests/certdb_gtest/alg1485_unittest.cc | 92 ++++++++++++++++++++++ security/nss/gtests/certdb_gtest/certdb_gtest.gyp | 29 +++++++ security/nss/gtests/certdb_gtest/manifest.mn | 22 ++++++ 4 files changed, 186 insertions(+) create mode 100644 security/nss/gtests/certdb_gtest/Makefile create mode 100644 security/nss/gtests/certdb_gtest/alg1485_unittest.cc create mode 100644 security/nss/gtests/certdb_gtest/certdb_gtest.gyp create mode 100644 security/nss/gtests/certdb_gtest/manifest.mn (limited to 'security/nss/gtests/certdb_gtest') diff --git a/security/nss/gtests/certdb_gtest/Makefile b/security/nss/gtests/certdb_gtest/Makefile new file mode 100644 index 000000000..0d547e080 --- /dev/null +++ b/security/nss/gtests/certdb_gtest/Makefile @@ -0,0 +1,43 @@ +#! gmake +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORE_DEPTH)/coreconf/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include ../common/gtest.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORE_DEPTH)/coreconf/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### diff --git a/security/nss/gtests/certdb_gtest/alg1485_unittest.cc b/security/nss/gtests/certdb_gtest/alg1485_unittest.cc new file mode 100644 index 000000000..b7c659414 --- /dev/null +++ b/security/nss/gtests/certdb_gtest/alg1485_unittest.cc @@ -0,0 +1,92 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include + +#include "gtest/gtest.h" + +#include "nss.h" +#include "scoped_ptrs.h" + +namespace nss_test { + +typedef struct AVATestValuesStr { + std::string avaString; + bool expectedResult; +} AVATestValues; + +typedef struct AVACompareValuesStr { + std::string avaString1; + std::string avaString2; + SECComparison expectedResult; +} AVACompareValues; + +class Alg1485Test : public ::testing::Test {}; + +class Alg1485ParseTest : public Alg1485Test, + public ::testing::WithParamInterface {}; + +class Alg1485CompareTest + : public Alg1485Test, + public ::testing::WithParamInterface {}; + +static const AVATestValues kAVATestStrings[] = { + {"CN=Marshall T. Rose, O=Dover Beach Consulting, L=Santa Clara, " + "ST=California, C=US", + true}, + {"C=HU,L=Budapest,O=Organization,CN=Example - Qualified Citizen " + "CA,2.5.4.97=VATHU-10", + true}, + {"C=HU,L=Budapest,O=Example,CN=Example - Qualified Citizen " + "CA,OID.2.5.4.97=VATHU-10", + true}, + {"CN=Somebody,L=Set,O=Up,C=US,1=The,2=Bomb", true}, + {"OID.2.5.4.6=😑", true}, + {"2.5.4.6=😑", true}, + {"OID.moocow=😑", false}, // OIDs must be numeric + {"3.2=bad", false}, // OIDs cannot be overly large; 3 is too big + {"256.257=bad", false}, // Still too big + {"YO=LO", false}, // Unknown Tag, 'YO' + {"CN=Tester,ZZ=Top", false}, // Unknown tag, 'ZZ' + // These tests are disabled pending Bug 1363416 + // { "01.02.03=Nope", false }, // Numbers not in minimal form + // { "000001.0000000001=👌", false }, + // { "CN=Somebody,L=Set,O=Up,C=US,01=The,02=Bomb", false }, +}; + +static const AVACompareValues kAVACompareStrings[] = { + {"CN=Max, O=Mozilla, ST=Berlin", "CN=Max, O=Mozilla, ST=Berlin, C=DE", + SECLessThan}, + {"CN=Max, O=Mozilla, ST=Berlin, C=DE", "CN=Max, O=Mozilla, ST=Berlin", + SECGreaterThan}, + {"CN=Max, O=Mozilla, ST=Berlin, C=DE", "CN=Max, O=Mozilla, ST=Berlin, C=DE", + SECEqual}, + {"CN=Max1, O=Mozilla, ST=Berlin, C=DE", + "CN=Max2, O=Mozilla, ST=Berlin, C=DE", SECLessThan}, + {"CN=Max, O=Mozilla, ST=Berlin, C=DE", "CN=Max, O=Mozilla, ST=Berlin, C=US", + SECLessThan}, +}; + +TEST_P(Alg1485ParseTest, TryParsingAVAStrings) { + const AVATestValues& param(GetParam()); + + ScopedCERTName certName(CERT_AsciiToName(param.avaString.c_str())); + ASSERT_EQ(certName != nullptr, param.expectedResult); +} + +TEST_P(Alg1485CompareTest, CompareAVAStrings) { + const AVACompareValues& param(GetParam()); + ScopedCERTName a(CERT_AsciiToName(param.avaString1.c_str())); + ScopedCERTName b(CERT_AsciiToName(param.avaString2.c_str())); + ASSERT_TRUE(a && b); + EXPECT_EQ(param.expectedResult, CERT_CompareName(a.get(), b.get())); +} + +INSTANTIATE_TEST_CASE_P(ParseAVAStrings, Alg1485ParseTest, + ::testing::ValuesIn(kAVATestStrings)); +INSTANTIATE_TEST_CASE_P(CompareAVAStrings, Alg1485CompareTest, + ::testing::ValuesIn(kAVACompareStrings)); +} diff --git a/security/nss/gtests/certdb_gtest/certdb_gtest.gyp b/security/nss/gtests/certdb_gtest/certdb_gtest.gyp new file mode 100644 index 000000000..898102def --- /dev/null +++ b/security/nss/gtests/certdb_gtest/certdb_gtest.gyp @@ -0,0 +1,29 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +{ + 'includes': [ + '../../coreconf/config.gypi', + '../common/gtest.gypi', + ], + 'targets': [ + { + 'target_name': 'certdb_gtest', + 'type': 'executable', + 'sources': [ + 'alg1485_unittest.cc', + '<(DEPTH)/gtests/common/gtests.cc' + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports', + '<(DEPTH)/gtests/google_test/google_test.gyp:gtest', + '<(DEPTH)/lib/util/util.gyp:nssutil3', + '<(DEPTH)/lib/ssl/ssl.gyp:ssl3', + '<(DEPTH)/lib/nss/nss.gyp:nss3', + ] + } + ], + 'variables': { + 'module': 'nss' + } +} diff --git a/security/nss/gtests/certdb_gtest/manifest.mn b/security/nss/gtests/certdb_gtest/manifest.mn new file mode 100644 index 000000000..4a3a1fda0 --- /dev/null +++ b/security/nss/gtests/certdb_gtest/manifest.mn @@ -0,0 +1,22 @@ +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +CORE_DEPTH = ../.. +DEPTH = ../.. +MODULE = nss + +CPPSRCS = \ + alg1485_unittest.cc \ + $(NULL) + +INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \ + -I$(CORE_DEPTH)/gtests/common \ + -I$(CORE_DEPTH)/cpputil + +REQUIRES = nspr nss libdbm gtest + +PROGRAM = certdb_gtest + +EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) $(EXTRA_OBJS) \ + ../common/$(OBJDIR)/gtests$(OBJ_SUFFIX) -- cgit v1.2.3