| Index: net/third_party/nss/ssl/sslimpl.h
|
| ===================================================================
|
| --- net/third_party/nss/ssl/sslimpl.h (revision 130750)
|
| +++ net/third_party/nss/ssl/sslimpl.h (working copy)
|
| @@ -328,6 +328,8 @@
|
| #define ssl_V3_SUITES_IMPLEMENTED 30
|
| #endif /* NSS_ENABLE_ECC */
|
|
|
| +#define MAX_DTLS_SRTP_CIPHER_SUITES 4
|
| +
|
| typedef struct sslOptionsStr {
|
| /* If SSL_SetNextProtoNego has been called, then this contains the
|
| * list of supported protocols. */
|
| @@ -661,7 +663,7 @@
|
| int cipherType;
|
| SECItem cipherArg;
|
| int keyBits;
|
| - int secretKeyBits;
|
| + int secretKeyBits;
|
| } ssl2;
|
| struct {
|
| /* values that are copied into the server's on-disk SID cache. */
|
| @@ -953,6 +955,13 @@
|
| SSLNextProtoState nextProtoState;
|
|
|
| PRUint16 mtu; /* Our estimate of the MTU */
|
| +
|
| + /*
|
| + * DTLS-SRTP cipher suite preferences (if any)
|
| + */
|
| + PRUint16 dtlsSRTPCiphers[MAX_DTLS_SRTP_CIPHER_SUITES];
|
| + PRUint16 dtlsSRTPCipherCt;
|
| + PRUint16 dtlsSRTPCipherSuite; /* 0 if not selected */
|
| };
|
|
|
| #define DTLS_MAX_MTU 1500 /* Ethernet MTU but without subtracting the
|
| @@ -1889,6 +1898,7 @@
|
| const unsigned char *val, unsigned int valLen,
|
| unsigned char *out, unsigned int outLen);
|
|
|
| +
|
| #ifdef TRACE
|
| #define SSL_TRACE(msg) ssl_Trace msg
|
| #else
|
|
|