Commit a6962dfe authored by Franziskus Kiefer's avatar Franziskus Kiefer

Bug 1344380 - gtests for b64 bug and some fixes, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D256#inline-2146

--HG--
extra : rebase_source : 78aad1ffa272d2946e58c86769a44753dab4308f
extra : amend_source : ef827d28c53a0c203e134d8fdb8c0365a226f3af
parent 25629891
......@@ -8,6 +8,7 @@ MODULE = nss
CPPSRCS = \
util_utf8_unittest.cc \
util_b64_unittest.cc \
$(NULL)
INCLUDES += \
......
/* -*- 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 <climits>
#include <memory>
#include "nssb64.h"
#include "gtest/gtest.h"
#include "scoped_ptrs.h"
namespace nss_test {
class B64EncodeDecodeTest : public ::testing::Test {
public:
void TestDecodeStr(const std::string &str) {
ScopedSECItem tmp(
NSSBase64_DecodeBuffer(nullptr, nullptr, str.c_str(), str.size()));
ASSERT_TRUE(tmp);
char *out = NSSBase64_EncodeItem(nullptr, nullptr, 0, tmp.get());
ASSERT_TRUE(out);
ASSERT_EQ(std::string(out), str);
PORT_Free(out);
}
bool TestEncodeItem(SECItem *item) {
bool rv = true;
char *out = NSSBase64_EncodeItem(nullptr, nullptr, 0, item);
rv = !!out;
if (out) {
ScopedSECItem tmp(
NSSBase64_DecodeBuffer(nullptr, nullptr, out, strlen(out)));
EXPECT_TRUE(tmp);
EXPECT_EQ(SECEqual, SECITEM_CompareItem(item, tmp.get()));
PORT_Free(out);
}
return rv;
}
bool TestFakeDecode(size_t str_len) {
std::string str(str_len, 'A');
ScopedSECItem tmp(
NSSBase64_DecodeBuffer(nullptr, nullptr, str.c_str(), str.size()));
return !!tmp;
}
bool TestFakeEncode(size_t len) {
std::vector<uint8_t> data(len, 0x30);
SECItem tmp = {siBuffer, data.data(),
static_cast<unsigned int>(data.size())};
return TestEncodeItem(&tmp);
}
protected:
};
TEST_F(B64EncodeDecodeTest, DecEncTest) { TestDecodeStr("VGhpcyBpcyBOU1Mh"); }
TEST_F(B64EncodeDecodeTest, EncDecTest) {
uint8_t data[] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09};
SECItem tmp = {siBuffer, data, sizeof(data)};
TestEncodeItem(&tmp);
}
TEST_F(B64EncodeDecodeTest, FakeDecTest) { EXPECT_TRUE(TestFakeDecode(100)); }
TEST_F(B64EncodeDecodeTest, FakeEncDecTest) {
EXPECT_TRUE(TestFakeEncode(100));
}
// These takes a while ...
TEST_F(B64EncodeDecodeTest, LongFakeDecTest1) {
EXPECT_TRUE(TestFakeDecode(0x66666666));
}
TEST_F(B64EncodeDecodeTest, LongFakeEncDecTest1) { TestFakeEncode(0x3fffffff); }
TEST_F(B64EncodeDecodeTest, LongFakeEncDecTest2) {
EXPECT_FALSE(TestFakeEncode(0x40000000));
}
} // namespace nss_test
......@@ -12,7 +12,8 @@
'type': 'executable',
'sources': [
'util_utf8_unittest.cc',
'<(DEPTH)/gtests/common/gtests.cc'
'util_b64_unittest.cc',
'<(DEPTH)/gtests/common/gtests.cc',
],
'dependencies': [
'<(DEPTH)/exports.gyp:nss_exports',
......
......@@ -370,7 +370,7 @@ pl_base64_decode_flush(PLBase64Decoder *data)
static PRUint32
PL_Base64MaxDecodedLength(PRUint32 size)
{
return ((size * 3) / 4);
return size * 0.75;
}
/*
......
......@@ -282,20 +282,28 @@ PL_Base64MaxEncodedLength(PRUint32 size, PRUint32 line_length)
{
PRUint32 tokens, tokens_per_line, full_lines, line_break_chars, remainder;
/* This is the maximum length we support. */
if (size > 0x3fffffff) {
return 0;
}
tokens = (size + 2) / 3;
if (line_length == 0)
if (line_length == 0) {
return tokens * 4;
}
if (line_length < 4) /* too small! */
if (line_length < 4) { /* too small! */
line_length = 4;
}
tokens_per_line = line_length / 4;
full_lines = tokens / tokens_per_line;
remainder = (tokens - (full_lines * tokens_per_line)) * 4;
line_break_chars = full_lines * 2;
if (remainder == 0)
if (remainder == 0) {
line_break_chars -= 2;
}
return (full_lines * tokens_per_line * 4) + line_break_chars + remainder;
}
......@@ -447,13 +455,18 @@ PL_Base64EncodeBuffer(const unsigned char *src, PRUint32 srclen,
PRStatus status;
PR_ASSERT(srclen > 0);
if (srclen == 0)
if (srclen == 0) {
return dest;
}
/*
* How much space could we possibly need for encoding this input?
*/
need_length = PL_Base64MaxEncodedLength(srclen, line_length);
if (need_length == 0) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
}
/*
* Make sure we have at least that much, if output buffer provided.
......@@ -631,6 +644,10 @@ NSSBase64_EncodeItem(PLArenaPool *arenaOpt, char *outStrOpt,
}
max_out_len = PL_Base64MaxEncodedLength(inItem->len, 64);
if (max_out_len == 0) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
}
if (arenaOpt != NULL)
mark = PORT_ArenaMark(arenaOpt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment