diff options
| author | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 01:48:50 +0000 |
|---|---|---|
| committer | vadimt@chromium.org <vadimt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 01:48:50 +0000 |
| commit | 33fca12d265b8129e6cff8fc1fc9ad7b34a19bab (patch) | |
| tree | ef737a2c12192c512ea7e05460c758e42200590a /net/cert | |
| parent | 5cddcd140cbe8fc9a8e10e67142cee75dc99684b (diff) | |
| download | chromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.zip chromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.tar.gz chromium_src-33fca12d265b8129e6cff8fc1fc9ad7b34a19bab.tar.bz2 | |
Revert 239921 "Revert 239759 "The comment in base64.h implies th..."
*****************
Reverting the revert. Congrats, the original CL wasn't the cause for the failure; sorry for the mess.
*****************
> Revert 239759 "The comment in base64.h implies that base::Base64..."
>
> > The comment in base64.h implies that base::Base64Encode() can return false, but
> > this cannot happen in practice. Fix the comment.
> >
> > The implementation of Base64Encode() attempts to check for the return value
> > MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this
> > value. Remove the check.
> >
> > Remove unneeded integer cast.
> >
> > Change the return type to void.
> >
> > BUG=323357
> > TEST=base_unittests, compile all
> > TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org
> >
> > Review URL: https://codereview.chromium.org/86913002
>
> TBR=ricea@chromium.org
>
> Review URL: https://codereview.chromium.org/101113004
TBR=vadimt@chromium.org
Review URL: https://codereview.chromium.org/111883004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert')
| -rw-r--r-- | net/cert/x509_certificate.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc index 862a202..a095fdf 100644 --- a/net/cert/x509_certificate.cc +++ b/net/cert/x509_certificate.cc @@ -665,8 +665,7 @@ bool X509Certificate::GetPEMEncodedFromDER(const std::string& der_encoded, if (der_encoded.empty()) return false; std::string b64_encoded; - if (!base::Base64Encode(der_encoded, &b64_encoded) || b64_encoded.empty()) - return false; + base::Base64Encode(der_encoded, &b64_encoded); *pem_encoded = "-----BEGIN CERTIFICATE-----\n"; // Divide the Base-64 encoded data into 64-character chunks, as per |