diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 21:35:40 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 21:35:40 +0000 |
| commit | 4a5c2ec6d21eaab224eff826b524403c8852e936 (patch) | |
| tree | e8ebe419fda18938dbbcad081415701994d4d902 /ui/aura/root_window_host_linux.cc | |
| parent | b8d39a65ae7830fb2e255dd60bbe533610d38977 (diff) | |
| download | chromium_src-4a5c2ec6d21eaab224eff826b524403c8852e936.zip chromium_src-4a5c2ec6d21eaab224eff826b524403c8852e936.tar.gz chromium_src-4a5c2ec6d21eaab224eff826b524403c8852e936.tar.bz2 | |
Merge 146447 - This fixes the X509 certificate import so that it accepts actual PEM file.
Before we were only accepting the base64 encoded payload of the PEM
file (the base64 encoded DER cert). Now we strip off leading and
trailing garbage, the markers, and whitespace around the base64
encoded payload.
BUG=chromium:135499
TEST=ran unit test with new input.
Review URL: https://chromiumcodereview.appspot.com/10763012
TBR=gspencer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10802095
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@148207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_linux.cc')
0 files changed, 0 insertions, 0 deletions