Index: webrtc/base/sslstreamadapter.h |
diff --git a/webrtc/base/sslstreamadapter.h b/webrtc/base/sslstreamadapter.h |
index c57056b14ad1b2336b1527c00bd7c24059ff02f0..65a7729d163b30a237aaaa607e51768dbb09b04d 100644 |
--- a/webrtc/base/sslstreamadapter.h |
+++ b/webrtc/base/sslstreamadapter.h |
@@ -19,11 +19,7 @@ |
namespace rtc { |
-// Constants for SSL profile. |
-const int TLS_NULL_WITH_NULL_NULL = 0; |
- |
// Constants for SRTP profiles. |
-const int SRTP_INVALID_CRYPTO_SUITE = 0; |
const int SRTP_AES128_CM_SHA1_80 = 0x0001; |
const int SRTP_AES128_CM_SHA1_32 = 0x0002; |
@@ -35,13 +31,10 @@ |
// 128-bit AES with 32-bit SHA-1 HMAC. |
extern const char CS_AES_CM_128_HMAC_SHA1_32[]; |
-// Given the DTLS-SRTP protection profile ID, as defined in |
-// https://tools.ietf.org/html/rfc4568#section-6.2 , return the SRTP profile |
-// name, as defined in https://tools.ietf.org/html/rfc5764#section-4.1.2. |
-std::string SrtpCryptoSuiteToName(int crypto_suite); |
- |
-// The reverse of above conversion. |
-int SrtpCryptoSuiteFromName(const std::string& crypto_suite); |
+// Returns the DTLS-SRTP protection profile ID, as defined in |
+// https://tools.ietf.org/html/rfc5764#section-4.1.2, for the given SRTP |
+// Crypto-suite, as defined in https://tools.ietf.org/html/rfc4568#section-6.2 |
+int GetSrtpCryptoSuiteFromName(const std::string& cipher_rfc_name); |
// SSLStreamAdapter : A StreamInterfaceAdapter that does SSL/TLS. |
// After SSL has been started, the stream will only open on successful |
@@ -159,7 +152,7 @@ |
// Retrieves the IANA registration id of the cipher suite used for the |
// connection (e.g. 0x2F for "TLS_RSA_WITH_AES_128_CBC_SHA"). |
- virtual bool GetSslCipherSuite(int* cipher_suite); |
+ virtual bool GetSslCipherSuite(int* cipher); |
// Key Exporter interface from RFC 5705 |
// Arguments are: |
@@ -181,8 +174,8 @@ |
size_t result_len); |
// DTLS-SRTP interface |
- virtual bool SetDtlsSrtpCryptoSuites(const std::vector<int>& crypto_suites); |
- virtual bool GetDtlsSrtpCryptoSuite(int* crypto_suite); |
+ virtual bool SetDtlsSrtpCiphers(const std::vector<std::string>& ciphers); |
+ virtual bool GetDtlsSrtpCipher(std::string* cipher); |
// Capabilities testing |
static bool HaveDtls(); |
@@ -198,7 +191,7 @@ |
// TODO(guoweis): Move this away from a static class method. Currently this is |
// introduced such that any caller could depend on sslstreamadapter.h without |
// depending on specific SSL implementation. |
- static std::string SslCipherSuiteToName(int cipher_suite); |
+ static std::string GetSslCipherSuiteName(int cipher); |
private: |
// If true, the server certificate need not match the configured |