Remove DtlsIdentityStoreInterface, it is no longer used.
This interface and its implementations have been replaced by rtc::RTCCertificateGeneratorInterface. Removes dtlsidentitystore.h, updates .gyp/gn and removes old #includes. BUG=webrtc:5707, webrtc:5708 Review-Url: https://codereview.webrtc.org/2034013003 Cr-Commit-Position: refs/heads/master@{#13432}
This commit is contained in:
parent
a2c900877d
commit
3d70fef3f3
@ -36,7 +36,6 @@ source_set("libjingle_peerconnection") {
|
||||
"datachannel.cc",
|
||||
"datachannel.h",
|
||||
"datachannelinterface.h",
|
||||
"dtlsidentitystore.h",
|
||||
"dtmfsender.cc",
|
||||
"dtmfsender.h",
|
||||
"dtmfsenderinterface.h",
|
||||
|
||||
@ -44,7 +44,6 @@
|
||||
#include <utility>
|
||||
|
||||
#include "webrtc/api/androidvideocapturer.h"
|
||||
#include "webrtc/api/dtlsidentitystore.h"
|
||||
#include "webrtc/api/android/jni/androidmediadecoder_jni.h"
|
||||
#include "webrtc/api/android/jni/androidmediaencoder_jni.h"
|
||||
#include "webrtc/api/android/jni/androidnetworkmonitor_jni.h"
|
||||
|
||||
@ -108,7 +108,6 @@
|
||||
'datachannel.cc',
|
||||
'datachannel.h',
|
||||
'datachannelinterface.h',
|
||||
'dtlsidentitystore.h',
|
||||
'dtmfsender.cc',
|
||||
'dtmfsender.h',
|
||||
'dtmfsenderinterface.h',
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
/*
|
||||
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_API_DTLSIDENTITYSTORE_H_
|
||||
#define WEBRTC_API_DTLSIDENTITYSTORE_H_
|
||||
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "webrtc/base/messagehandler.h"
|
||||
#include "webrtc/base/messagequeue.h"
|
||||
#include "webrtc/base/optional.h"
|
||||
#include "webrtc/base/refcount.h"
|
||||
#include "webrtc/base/rtccertificategenerator.h"
|
||||
#include "webrtc/base/scoped_ref_ptr.h"
|
||||
#include "webrtc/base/sslidentity.h"
|
||||
#include "webrtc/base/thread.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
class SSLIdentity;
|
||||
class Thread;
|
||||
|
||||
// Used to receive callbacks of DTLS identity requests.
|
||||
class DtlsIdentityRequestObserver : public rtc::RefCountInterface {
|
||||
public:
|
||||
virtual void OnFailure(int error) = 0;
|
||||
// TODO(hbos): Unify the OnSuccess method once Chrome code is updated.
|
||||
virtual void OnSuccess(const std::string& der_cert,
|
||||
const std::string& der_private_key) = 0;
|
||||
// |identity| is a unique_ptr because rtc::SSLIdentity is not copyable and the
|
||||
// client has to get the ownership of the object to make use of it.
|
||||
virtual void OnSuccess(std::unique_ptr<rtc::SSLIdentity> identity) = 0;
|
||||
|
||||
protected:
|
||||
virtual ~DtlsIdentityRequestObserver() {}
|
||||
};
|
||||
|
||||
// This interface defines an in-memory DTLS identity store, which generates DTLS
|
||||
// identities.
|
||||
// APIs calls must be made on the signaling thread and the callbacks are also
|
||||
// called on the signaling thread.
|
||||
class DtlsIdentityStoreInterface {
|
||||
public:
|
||||
virtual ~DtlsIdentityStoreInterface() { }
|
||||
|
||||
// The |observer| will be called when the requested identity is ready, or when
|
||||
// identity generation fails.
|
||||
virtual void RequestIdentity(
|
||||
const rtc::KeyParams& key_params,
|
||||
const rtc::Optional<uint64_t>& expires_ms,
|
||||
const rtc::scoped_refptr<DtlsIdentityRequestObserver>& observer) = 0;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_API_DTLSIDENTITYSTORE_H_
|
||||
@ -27,7 +27,6 @@
|
||||
#include "webrtc/p2p/base/fakeportallocator.h"
|
||||
|
||||
using webrtc::DataChannelInterface;
|
||||
using webrtc::DtlsIdentityStoreInterface;
|
||||
using webrtc::FakeVideoTrackRenderer;
|
||||
using webrtc::MediaStreamInterface;
|
||||
using webrtc::PeerConnectionFactoryInterface;
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "webrtc/api/dtlsidentitystore.h"
|
||||
#include "webrtc/api/peerconnectioninterface.h"
|
||||
#include "webrtc/base/rtccertificate.h"
|
||||
#include "webrtc/base/rtccertificategenerator.h"
|
||||
|
||||
// RSA with mod size 1024, pub exp 0x10001.
|
||||
static const rtc::RTCCertificatePEM kRsaPems[] = {
|
||||
|
||||
@ -61,7 +61,6 @@ using webrtc::CreateSessionDescription;
|
||||
using webrtc::CreateSessionDescriptionObserver;
|
||||
using webrtc::CreateSessionDescriptionRequest;
|
||||
using webrtc::DataChannel;
|
||||
using webrtc::DtlsIdentityStoreInterface;
|
||||
using webrtc::FakeMetricsObserver;
|
||||
using webrtc::IceCandidateCollection;
|
||||
using webrtc::InternalDataChannelInit;
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "webrtc/api/dtlsidentitystore.h"
|
||||
#include "webrtc/api/peerconnectioninterface.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/base/messagehandler.h"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user