diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 18:28:32 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 18:28:32 +0000 |
| commit | 1555aefc47acad1eff95ced68be750d407d97476 (patch) | |
| tree | 0e21b93f35821d8272664e2f4fc93be88ce96a9a /net/third_party/nss | |
| parent | fbf3a625d4f5fd157e6c92a7b62c784f240151b0 (diff) | |
| download | chromium_src-1555aefc47acad1eff95ced68be750d407d97476.zip chromium_src-1555aefc47acad1eff95ced68be750d407d97476.tar.gz chromium_src-1555aefc47acad1eff95ced68be750d407d97476.tar.bz2 | |
The hashAlg field of CK_NSS_MAC_CONSTANT_TIME_PARAMS has been
renamed macAlg in the NSS upstream.
R=agl@chromium.org
BUG=172658
TEST=none
Review URL: https://chromiumcodereview.appspot.com/12220054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss')
| -rw-r--r-- | net/third_party/nss/patches/cbc.patch | 6 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/third_party/nss/patches/cbc.patch b/net/third_party/nss/patches/cbc.patch index 85da578..2f18da36 100644 --- a/net/third_party/nss/patches/cbc.patch +++ b/net/third_party/nss/patches/cbc.patch @@ -21,10 +21,10 @@ index c3706fe..4b79321 100644 +#define CKM_NSS_SSL3_MAC_CONSTANT_TIME (CKM_NSS + 20) + +typedef struct CK_NSS_MAC_CONSTANT_TIME_PARAMS { -+ CK_MECHANISM_TYPE hashAlg; /* in */ ++ CK_MECHANISM_TYPE macAlg; /* in */ + CK_ULONG ulBodyTotalLen; /* in */ + CK_BYTE * pHeader; /* in */ -+ CK_ULONG ulHeaderLen; /* in */ ++ CK_ULONG ulHeaderLen; /* in */ +} CK_NSS_MAC_CONSTANT_TIME_PARAMS; +#endif + @@ -104,7 +104,7 @@ index c3706fe..4b79321 100644 + params.ulHeaderLen = 13; + } + -+ params.hashAlg = spec->mac_def->mmech; ++ params.macAlg = spec->mac_def->mmech; + params.ulBodyTotalLen = originalLen; + params.pHeader = header; + diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index e38a624..4ed4b28 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -2034,10 +2034,10 @@ ssl3_ComputeRecordMAC( #define CKM_NSS_SSL3_MAC_CONSTANT_TIME (CKM_NSS + 20) typedef struct CK_NSS_MAC_CONSTANT_TIME_PARAMS { - CK_MECHANISM_TYPE hashAlg; /* in */ + CK_MECHANISM_TYPE macAlg; /* in */ CK_ULONG ulBodyTotalLen; /* in */ CK_BYTE * pHeader; /* in */ - CK_ULONG ulHeaderLen; /* in */ + CK_ULONG ulHeaderLen; /* in */ } CK_NSS_MAC_CONSTANT_TIME_PARAMS; #endif @@ -2117,7 +2117,7 @@ ssl3_ComputeRecordMACConstantTime( params.ulHeaderLen = 13; } - params.hashAlg = spec->mac_def->mmech; + params.macAlg = spec->mac_def->mmech; params.ulBodyTotalLen = originalLen; params.pHeader = header; |