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

Unified Diff: remoting/protocol/me2me_host_authenticator_factory.cc

Issue 12316083: Move HostKeyPair into protocol::KeyPair. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/me2me_host_authenticator_factory.h ('k') | remoting/protocol/negotiating_authenticator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/me2me_host_authenticator_factory.cc
diff --git a/remoting/protocol/me2me_host_authenticator_factory.cc b/remoting/protocol/me2me_host_authenticator_factory.cc
index c871b6c5cfafeabcb2f54f2b216bf2392f16765b..9a04d89742cbf5131e04b80ea1447619af5b5697 100644
--- a/remoting/protocol/me2me_host_authenticator_factory.cc
+++ b/remoting/protocol/me2me_host_authenticator_factory.cc
@@ -6,7 +6,7 @@
#include "base/base64.h"
#include "base/string_util.h"
-#include "crypto/rsa_private_key.h"
+#include "remoting/base/rsa_key_pair.h"
#include "remoting/protocol/channel_authenticator.h"
#include "remoting/protocol/negotiating_authenticator.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ -60,10 +60,10 @@ class RejectingAuthenticator : public Authenticator {
Me2MeHostAuthenticatorFactory::Me2MeHostAuthenticatorFactory(
const std::string& local_cert,
- const crypto::RSAPrivateKey& local_private_key,
+ scoped_refptr<RsaKeyPair> key_pair,
const SharedSecretHash& shared_secret_hash)
: local_cert_(local_cert),
- local_private_key_(local_private_key.Copy()),
+ key_pair_(key_pair),
shared_secret_hash_(shared_secret_hash) {
}
@@ -92,7 +92,7 @@ scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
}
return NegotiatingAuthenticator::CreateForHost(
- local_cert_, *local_private_key_, shared_secret_hash_.value,
+ local_cert_, key_pair_, shared_secret_hash_.value,
shared_secret_hash_.hash_function);
}
« no previous file with comments | « remoting/protocol/me2me_host_authenticator_factory.h ('k') | remoting/protocol/negotiating_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698