Index: net/third_party/nss/ssl/sslimpl.h |
=================================================================== |
--- net/third_party/nss/ssl/sslimpl.h (revision 218090) |
+++ net/third_party/nss/ssl/sslimpl.h (working copy) |
@@ -72,6 +72,7 @@ |
#define hmac_md5 ssl_hmac_md5 |
#define hmac_sha ssl_hmac_sha |
#define hmac_sha256 ssl_hmac_sha256 |
+#define mac_aead ssl_mac_aead |
#define SET_ERROR_CODE /* reminder */ |
#define SEND_ALERT /* reminder */ |
@@ -533,9 +534,8 @@ |
int maxout, |
const unsigned char *in, |
int inlen, |
- SSL3ContentType type, |
- SSL3ProtocolVersion version, |
- SSL3SequenceNumber seqnum); |
+ const unsigned char *additionalData, |
+ int additionalDataLen); |
typedef SECStatus (*SSLCompressor)(void * context, |
unsigned char * out, |
int * outlen, |