Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Bug 1334054 - fix CERT_FormatName output buffer length calculation r=…
…franziskus Summary: Before this patch, CERT_FormatName attempted to account for the length of the additional formatting in its output buffer length, but added an insufficient amount (a fixed 128 bytes). This patch dynamically accounts for the additional space required by the formatting output (it can over-account in some cases, but this is unlikely to be a performance concern compared to the original implementation). Reviewers: franziskus Differential Revision: https://nss-review.dev.mozaws.net/D307 --HG-- rename : gtests/der_gtest/Makefile => gtests/certhigh_gtest/Makefile rename : gtests/der_gtest/der_gtest.gyp => gtests/certhigh_gtest/certhigh_gtest.gyp rename : gtests/der_gtest/manifest.mn => gtests/certhigh_gtest/manifest.mn extra : rebase_source : 1fb5cbf1c77018e6d7f9f9aed0f3d9a3b33f4909
- Loading branch information
Showing
8 changed files
with
179 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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). # | ||
####################################################################### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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': 'certhigh_gtest', | ||
'type': 'executable', | ||
'sources': [ | ||
'certhigh_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' | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* -*- 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 <string> | ||
|
||
#include "gtest/gtest.h" | ||
|
||
#include "cert.h" | ||
#include "certt.h" | ||
#include "secitem.h" | ||
|
||
namespace nss_test { | ||
|
||
class CERT_FormatNameUnitTest : public ::testing::Test {}; | ||
|
||
TEST_F(CERT_FormatNameUnitTest, Overflow) { | ||
// Construct a CERTName consisting of a single RDN with 20 organizational unit | ||
// AVAs and 20 domain component AVAs. The actual contents don't matter, just | ||
// the types. | ||
|
||
uint8_t oidValueBytes[] = {0x0c, 0x02, 0x58, 0x58}; // utf8String "XX" | ||
SECItem oidValue = {siBuffer, oidValueBytes, sizeof(oidValueBytes)}; | ||
uint8_t oidTypeOUBytes[] = {0x55, 0x04, 0x0b}; // organizationalUnit | ||
SECItem oidTypeOU = {siBuffer, oidTypeOUBytes, sizeof(oidTypeOUBytes)}; | ||
CERTAVA ouAVA = {oidTypeOU, oidValue}; | ||
uint8_t oidTypeDCBytes[] = {0x09, 0x92, 0x26, 0x89, 0x93, | ||
0xf2, 0x2c, 0x64, 0x1, 0x19}; // domainComponent | ||
SECItem oidTypeDC = {siBuffer, oidTypeDCBytes, sizeof(oidTypeDCBytes)}; | ||
CERTAVA dcAVA = {oidTypeDC, oidValue}; | ||
|
||
const int kNumEachAVA = 20; | ||
CERTAVA* avas[(2 * kNumEachAVA) + 1]; | ||
for (int i = 0; i < kNumEachAVA; i++) { | ||
avas[2 * i] = &ouAVA; | ||
avas[(2 * i) + 1] = &dcAVA; | ||
} | ||
avas[2 * kNumEachAVA] = nullptr; | ||
|
||
CERTRDN rdn = {avas}; | ||
CERTRDN* rdns[2]; | ||
rdns[0] = &rdn; | ||
rdns[1] = nullptr; | ||
|
||
std::string expectedResult = | ||
"XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>" | ||
"XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>" | ||
"XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>XX<br>" | ||
"XX<br>XX<br>XX<br>XX<br>"; | ||
|
||
CERTName name = {nullptr, rdns}; | ||
char* result = CERT_FormatName(&name); | ||
EXPECT_EQ(expectedResult, result); | ||
PORT_Free(result); | ||
} | ||
|
||
} // namespace nss_test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 = \ | ||
certhigh_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 = certhigh_gtest | ||
|
||
EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) $(EXTRA_OBJS) \ | ||
../common/$(OBJDIR)/gtests$(OBJ_SUFFIX) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ DEPTH = .. | |
DIRS = \ | ||
google_test \ | ||
common \ | ||
certhigh_gtest \ | ||
der_gtest \ | ||
util_gtest \ | ||
pk11_gtest \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters