Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: net/cert/internal/signature_algorithm.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/cert/internal/path_builder.cc ('k') | net/cert_net/cert_net_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/internal/signature_algorithm.h" 5 #include "net/cert/internal/signature_algorithm.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 return base::WrapUnique( 591 return base::WrapUnique(
592 new SignatureAlgorithm(SignatureAlgorithmId::Ecdsa, digest, nullptr)); 592 new SignatureAlgorithm(SignatureAlgorithmId::Ecdsa, digest, nullptr));
593 } 593 }
594 594
595 std::unique_ptr<SignatureAlgorithm> SignatureAlgorithm::CreateRsaPss( 595 std::unique_ptr<SignatureAlgorithm> SignatureAlgorithm::CreateRsaPss(
596 DigestAlgorithm digest, 596 DigestAlgorithm digest,
597 DigestAlgorithm mgf1_hash, 597 DigestAlgorithm mgf1_hash,
598 uint32_t salt_length) { 598 uint32_t salt_length) {
599 return base::WrapUnique(new SignatureAlgorithm( 599 return base::WrapUnique(new SignatureAlgorithm(
600 SignatureAlgorithmId::RsaPss, digest, 600 SignatureAlgorithmId::RsaPss, digest,
601 base::WrapUnique(new RsaPssParameters(mgf1_hash, salt_length)))); 601 base::MakeUnique<RsaPssParameters>(mgf1_hash, salt_length)));
602 } 602 }
603 603
604 const RsaPssParameters* SignatureAlgorithm::ParamsForRsaPss() const { 604 const RsaPssParameters* SignatureAlgorithm::ParamsForRsaPss() const {
605 if (algorithm_ == SignatureAlgorithmId::RsaPss) 605 if (algorithm_ == SignatureAlgorithmId::RsaPss)
606 return static_cast<RsaPssParameters*>(params_.get()); 606 return static_cast<RsaPssParameters*>(params_.get());
607 return nullptr; 607 return nullptr;
608 } 608 }
609 609
610 SignatureAlgorithm::SignatureAlgorithm( 610 SignatureAlgorithm::SignatureAlgorithm(
611 SignatureAlgorithmId algorithm, 611 SignatureAlgorithmId algorithm,
612 DigestAlgorithm digest, 612 DigestAlgorithm digest,
613 std::unique_ptr<SignatureAlgorithmParameters> params) 613 std::unique_ptr<SignatureAlgorithmParameters> params)
614 : algorithm_(algorithm), digest_(digest), params_(std::move(params)) {} 614 : algorithm_(algorithm), digest_(digest), params_(std::move(params)) {}
615 615
616 } // namespace net 616 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/internal/path_builder.cc ('k') | net/cert_net/cert_net_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698