diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 13:54:32 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 13:54:32 +0000 |
| commit | 40ecbe7fbf307b05d68c80aa52e519e1bfe68d8a (patch) | |
| tree | 09d4f0c76ccb43a9145abafcb1d68e1f6f900976 /net/third_party | |
| parent | f485985e24c08cb6186870dd0b0a02e4684a85ac (diff) | |
| download | chromium_src-40ecbe7fbf307b05d68c80aa52e519e1bfe68d8a.zip chromium_src-40ecbe7fbf307b05d68c80aa52e519e1bfe68d8a.tar.gz chromium_src-40ecbe7fbf307b05d68c80aa52e519e1bfe68d8a.tar.bz2 | |
Update to the new definitions of CKM_NSS_CHACHA20_POLY1305 and
struct CK_NSS_AEAD_PARAMS.
This updates code added in https://codereview.chromium.org/23619044.
R=agl@chromium.org
BUG=310768
TEST=none
Review URL: https://codereview.chromium.org/36073014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index 7b93a63..8395f61 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -43,15 +43,15 @@ /* This is a bodge to allow this code to be compiled against older NSS * headers. */ #ifndef CKM_NSS_CHACHA20_POLY1305 -#define CKM_NSS_CHACHA20_POLY1305 (CKM_NSS + 25) +#define CKM_NSS_CHACHA20_POLY1305 (CKM_NSS + 26) -typedef struct CK_AEAD_PARAMS { - CK_BYTE_PTR pIv; /* This is the nonce. */ - CK_ULONG ulIvLen; - CK_BYTE_PTR pAAD; - CK_ULONG ulAADLen; - CK_ULONG ulTagBits; -} CK_AEAD_PARAMS; +typedef struct CK_NSS_AEAD_PARAMS { + CK_BYTE_PTR pIv; /* This is the nonce. */ + CK_ULONG ulIvLen; + CK_BYTE_PTR pAAD; + CK_ULONG ulAADLen; + CK_ULONG ulTagLen; +} CK_NSS_AEAD_PARAMS; #endif @@ -2064,18 +2064,18 @@ ssl3_ChaCha20Poly1305( SECItem param; SECStatus rv = SECFailure; unsigned int uOutLen; - CK_AEAD_PARAMS aeadParams; + CK_NSS_AEAD_PARAMS aeadParams; static const int tagSize = 16; param.type = siBuffer; param.len = sizeof(aeadParams); param.data = (unsigned char *) &aeadParams; - memset(&aeadParams, 0, sizeof(CK_AEAD_PARAMS)); + memset(&aeadParams, 0, sizeof(aeadParams)); aeadParams.pIv = (unsigned char *) additionalData; aeadParams.ulIvLen = 8; aeadParams.pAAD = (unsigned char *) additionalData; aeadParams.ulAADLen = additionalDataLen; - aeadParams.ulTagBits = tagSize * 8; + aeadParams.ulTagLen = tagSize; if (doDecrypt) { rv = pk11_decrypt(keys->write_key, CKM_NSS_CHACHA20_POLY1305, ¶m, |