2bf0e90c9d
I'm reverting the patch due to compilation issues. It would be great if we could make sure Chromium is ready for the patch before we land it in WebRTC.
As is, we're trying to roll webrtc into Chromium and we can't (this is not the only reason though). I might reland this after the roll, depending on how that goes though.
Here's an example failure:
e:\b\build\slave\win_gn\build\src\jingle\glue\channel_socket_adapter_unittest.cc(77) : error C2259: 'jingle_glue::MockTransportChannel' : cannot instantiate abstract class
due to following members:
'bool cricket::TransportChannel::GetSslCipher(std::string *)' : is abstract
e:\b\build\slave\win_gn\build\src\third_party\webrtc\p2p\base\transportchannel.h(107) : see declaration of 'cricket::TransportChannel::GetSslCipher'
ninja: build stopped: subcommand failed.
> This CL adds an API to the SSL stream adapters and transport channels to get the SSL cipher that was negotiated with the remote peer.
>
> BUG=3976
> R=davidben@chromium.org, juberti@webrtc.org, pthatcher@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/26009004
TBR=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40689004
Cr-Commit-Position: refs/heads/master@{#8282}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8282 4adac7df-926f-26a2-2b94-8c16560cd09d
112 lines
3.5 KiB
C++
112 lines
3.5 KiB
C++
/*
|
|
* Copyright 2004 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_BASE_NSSSTREAMADAPTER_H_
|
|
#define WEBRTC_BASE_NSSSTREAMADAPTER_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "nspr.h"
|
|
#include "nss.h"
|
|
#include "secmodt.h"
|
|
|
|
#include "webrtc/base/buffer.h"
|
|
#include "webrtc/base/nssidentity.h"
|
|
#include "webrtc/base/ssladapter.h"
|
|
#include "webrtc/base/sslstreamadapter.h"
|
|
#include "webrtc/base/sslstreamadapterhelper.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Singleton
|
|
class NSSContext {
|
|
public:
|
|
NSSContext() {}
|
|
~NSSContext() {
|
|
}
|
|
|
|
static PK11SlotInfo *GetSlot() {
|
|
return Instance() ? Instance()->slot_: NULL;
|
|
}
|
|
|
|
static NSSContext *Instance();
|
|
static bool InitializeSSL(VerificationCallback callback);
|
|
static bool InitializeSSLThread();
|
|
static bool CleanupSSL();
|
|
|
|
private:
|
|
PK11SlotInfo *slot_; // The PKCS-11 slot
|
|
static bool initialized; // Was this initialized?
|
|
static NSSContext *global_nss_context; // The global context
|
|
};
|
|
|
|
|
|
class NSSStreamAdapter : public SSLStreamAdapterHelper {
|
|
public:
|
|
explicit NSSStreamAdapter(StreamInterface* stream);
|
|
virtual ~NSSStreamAdapter();
|
|
bool Init();
|
|
|
|
virtual StreamResult Read(void* data, size_t data_len,
|
|
size_t* read, int* error);
|
|
virtual StreamResult Write(const void* data, size_t data_len,
|
|
size_t* written, int* error);
|
|
void OnMessage(Message *msg);
|
|
|
|
// Key Extractor interface
|
|
virtual bool ExportKeyingMaterial(const std::string& label,
|
|
const uint8* context,
|
|
size_t context_len,
|
|
bool use_context,
|
|
uint8* result,
|
|
size_t result_len);
|
|
|
|
// DTLS-SRTP interface
|
|
virtual bool SetDtlsSrtpCiphers(const std::vector<std::string>& ciphers);
|
|
virtual bool GetDtlsSrtpCipher(std::string* cipher);
|
|
|
|
// Capabilities interfaces
|
|
static bool HaveDtls();
|
|
static bool HaveDtlsSrtp();
|
|
static bool HaveExporter();
|
|
|
|
protected:
|
|
// Override SSLStreamAdapter
|
|
virtual void OnEvent(StreamInterface* stream, int events, int err);
|
|
|
|
// Override SSLStreamAdapterHelper
|
|
virtual int BeginSSL();
|
|
virtual void Cleanup();
|
|
virtual bool GetDigestLength(const std::string& algorithm, size_t* length) {
|
|
return NSSCertificate::GetDigestLength(algorithm, length);
|
|
}
|
|
|
|
private:
|
|
int ContinueSSL();
|
|
static SECStatus AuthCertificateHook(void *arg, PRFileDesc *fd,
|
|
PRBool checksig, PRBool isServer);
|
|
static SECStatus GetClientAuthDataHook(void *arg, PRFileDesc *fd,
|
|
CERTDistNames *caNames,
|
|
CERTCertificate **pRetCert,
|
|
SECKEYPrivateKey **pRetKey);
|
|
|
|
PRFileDesc *ssl_fd_; // NSS's SSL file descriptor
|
|
static bool initialized; // Was InitializeSSL() called?
|
|
bool cert_ok_; // Did we get and check a cert
|
|
std::vector<PRUint16> srtp_ciphers_; // SRTP cipher list
|
|
|
|
static PRDescIdentity nspr_layer_identity; // The NSPR layer identity
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_BASE_NSSSTREAMADAPTER_H_
|