diff options
author | nharper <nharper@chromium.org> | 2016-01-13 19:42:23 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 03:43:16 +0000 |
commit | f5c6253ac16f742fadffe210795d50b9344383ae (patch) | |
tree | ca9255a06d6bc5db6ef10e4e7135431ad06923f6 /net/cert/asn1_util.cc | |
parent | 39f391d6cdbc2c56e906d85504a39c8cda194824 (diff) | |
download | chromium_src-f5c6253ac16f742fadffe210795d50b9344383ae.zip chromium_src-f5c6253ac16f742fadffe210795d50b9344383ae.tar.gz chromium_src-f5c6253ac16f742fadffe210795d50b9344383ae.tar.bz2 |
Refactor der::Input helper methods into new constructors
Review URL: https://codereview.chromium.org/1573243011
Cr-Commit-Position: refs/heads/master@{#369311}
Diffstat (limited to 'net/cert/asn1_util.cc')
-rw-r--r-- | net/cert/asn1_util.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/net/cert/asn1_util.cc b/net/cert/asn1_util.cc index 7f2ebc9..315ca75 100644 --- a/net/cert/asn1_util.cc +++ b/net/cert/asn1_util.cc @@ -70,26 +70,17 @@ bool SeekToSPKI(der::Input in, der::Parser* tbs_certificate) { return true; } -der::Input InputFromStringPiece(base::StringPiece in) { - return der::Input(reinterpret_cast<const uint8_t*>(in.data()), in.length()); -} - -base::StringPiece StringPieceFromInput(der::Input in) { - return base::StringPiece(reinterpret_cast<const char*>(in.UnsafeData()), - in.Length()); -} - } // namespace bool ExtractSPKIFromDERCert(base::StringPiece cert, base::StringPiece* spki_out) { der::Parser parser; - if (!SeekToSPKI(InputFromStringPiece(cert), &parser)) + if (!SeekToSPKI(der::Input(cert), &parser)) return false; der::Input spki; if (!parser.ReadRawTLV(&spki)) return false; - *spki_out = StringPieceFromInput(spki); + *spki_out = spki.AsStringPiece(); return true; } @@ -105,7 +96,7 @@ bool ExtractSubjectPublicKeyFromSPKI(base::StringPiece spki, // parameters ANY DEFINED BY algorithm OPTIONAL } // Step into SubjectPublicKeyInfo sequence. - der::Parser parser(InputFromStringPiece(spki)); + der::Parser parser((der::Input(spki))); der::Parser spki_parser; if (!parser.ReadSequence(&spki_parser)) return false; @@ -118,7 +109,7 @@ bool ExtractSubjectPublicKeyFromSPKI(base::StringPiece spki, der::Input spk; if (!spki_parser.ReadTag(der::kBitString, &spk)) return false; - *spk_out = StringPieceFromInput(spk); + *spk_out = spk.AsStringPiece(); return true; } @@ -130,7 +121,7 @@ bool ExtractCRLURLsFromDERCert(base::StringPiece cert, bool present; der::Parser tbs_cert_parser; - if (!SeekToSPKI(InputFromStringPiece(cert), &tbs_cert_parser)) + if (!SeekToSPKI(der::Input(cert), &tbs_cert_parser)) return false; // From RFC 5280, section 4.1 @@ -281,7 +272,7 @@ bool ExtractCRLURLsFromDERCert(base::StringPiece cert, } if (present) { // This does not validate that |url| is a valid IA5String. - tmp_urls_out.push_back(StringPieceFromInput(url)); + tmp_urls_out.push_back(url.AsStringPiece()); } else { der::Tag unused_tag; der::Input unused_value; |