Commit c16c4e3c authored by Anatoliy Potapchuk's avatar Anatoliy Potapchuk Committed by Commit Bot

Ignore all newlines when parsing base64-encoded PKCS12 certificates from ONC

Bug: 918101
Test: chromeos_unittest --gtest_filter=*OncParsedCertificatesTest*
Change-Id: I02dd141d8a2b809a3424f453bf5c9df3ea1c1321
Reviewed-on: https://chromium-review.googlesource.com/c/1425705
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: default avatarPavol Marko <pmarko@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625187}
parent 65dec71e
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/base64.h" #include "base/base64.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/strings/string_util.h"
#include "base/values.h" #include "base/values.h"
#include "chromeos/network/onc/onc_utils.h" #include "chromeos/network/onc/onc_utils.h"
#include "components/onc/onc_constants.h" #include "components/onc/onc_constants.h"
...@@ -255,7 +256,8 @@ bool OncParsedCertificates::ParseClientCertificate( ...@@ -255,7 +256,8 @@ bool OncParsedCertificates::ParseClientCertificate(
} }
std::string pkcs12_data; std::string pkcs12_data;
if (!base::Base64Decode(base64_pkcs12_data_key->GetString(), &pkcs12_data)) { base::RemoveChars(base64_pkcs12_data_key->GetString(), "\n", &pkcs12_data);
if (!base::Base64Decode(pkcs12_data, &pkcs12_data)) {
LOG(ERROR) << "Unable to base64 decode PKCS#12 data: \"" LOG(ERROR) << "Unable to base64 decode PKCS#12 data: \""
<< base64_pkcs12_data_key->GetString() << "\"."; << base64_pkcs12_data_key->GetString() << "\".";
return false; return false;
......
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