01e8e625ad
This fixes uninitialized memory read reported by Nick Mathewson in https://github.com/openssl/openssl/issues/6347. It imports the memset from upstream's 2c739f72e5236a8e0c351c00047c77083dcdb77f, but I believe that fix is incorrect and instead RC4 shouldn't be allowed in this context. See https://github.com/openssl/openssl/pull/6603#issuecomment-413066462 for details. Update-Note: Decoding a password-protected PEM block with RC4 will, rather than derive garbage from uninitialized memory, simply fail. Trying to encode a password-protect PEM block with an unsupported cipher will also fail, rather than output garbage (e.g. tag-less AES-GCM). Change-Id: Ib7e23dbf5514f0a523730926daad3c0bdb989417 Reviewed-on: https://boringssl-review.googlesource.com/31084 Reviewed-by: Adam Langley <agl@google.com>
46 lines
1.7 KiB
C++
46 lines
1.7 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. */
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <openssl/bio.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/rsa.h>
|
|
|
|
|
|
// Test that implausible ciphers, notably an IV-less RC4, aren't allowed in PEM.
|
|
// This is a regression test for https://github.com/openssl/openssl/issues/6347,
|
|
// though our fix differs from upstream.
|
|
TEST(PEMTest, NoRC4) {
|
|
static const char kPEM[] =
|
|
"-----BEGIN RSA PUBLIC KEY-----\n"
|
|
"Proc-Type: 4,ENCRYPTED\n"
|
|
"DEK-Info: RC4 -\n"
|
|
"extra-info\n"
|
|
"router-signature\n"
|
|
"\n"
|
|
"Z1w=\n"
|
|
"-----END RSA PUBLIC KEY-----\n";
|
|
bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(kPEM, sizeof(kPEM) - 1));
|
|
ASSERT_TRUE(bio);
|
|
bssl::UniquePtr<RSA> rsa(PEM_read_bio_RSAPublicKey(
|
|
bio.get(), nullptr, nullptr, const_cast<char *>("password")));
|
|
EXPECT_FALSE(rsa);
|
|
uint32_t err = ERR_get_error();
|
|
EXPECT_EQ(ERR_LIB_PEM, ERR_GET_LIB(err));
|
|
EXPECT_EQ(PEM_R_UNSUPPORTED_ENCRYPTION, ERR_GET_REASON(err));
|
|
}
|