diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 18:50:45 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 18:50:45 +0000 |
| commit | 4f99c556d1221778c1e6e38c199dfa93726a4425 (patch) | |
| tree | 25472000648f99ddb428145fe112fd4b2d769196 /net | |
| parent | ef2c674e2fadd48ba5299dcbfe5a0d4fc806ee49 (diff) | |
| download | chromium_src-4f99c556d1221778c1e6e38c199dfa93726a4425.zip chromium_src-4f99c556d1221778c1e6e38c199dfa93726a4425.tar.gz chromium_src-4f99c556d1221778c1e6e38c199dfa93726a4425.tar.bz2 | |
nss: fix order of parenthesis.
Thanks to PVS-Studio for finding this.
BUG=324701
Review URL: https://codereview.chromium.org/99423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/third_party/nss/patches/channelid.patch | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/third_party/nss/patches/channelid.patch b/net/third_party/nss/patches/channelid.patch index 46554f9..b2ab19d 100644 --- a/net/third_party/nss/patches/channelid.patch +++ b/net/third_party/nss/patches/channelid.patch @@ -151,7 +151,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c + spki = SECKEY_EncodeDERSubjectPublicKeyInfo(ss->ssl3.channelIDPub); + + if (spki->len != sizeof(P256_SPKI_PREFIX) + CHANNEL_ID_PUBLIC_KEY_LENGTH || -+ memcmp(spki->data, P256_SPKI_PREFIX, sizeof(P256_SPKI_PREFIX) != 0)) { ++ memcmp(spki->data, P256_SPKI_PREFIX, sizeof(P256_SPKI_PREFIX)) != 0) { + PORT_SetError(SSL_ERROR_INVALID_CHANNEL_ID_KEY); + rv = SECFailure; + goto loser; diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index ddb8232..06992e0 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -10712,7 +10712,7 @@ ssl3_SendEncryptedExtensions(sslSocket *ss) spki = SECKEY_EncodeDERSubjectPublicKeyInfo(ss->ssl3.channelIDPub); if (spki->len != sizeof(P256_SPKI_PREFIX) + CHANNEL_ID_PUBLIC_KEY_LENGTH || - memcmp(spki->data, P256_SPKI_PREFIX, sizeof(P256_SPKI_PREFIX) != 0)) { + memcmp(spki->data, P256_SPKI_PREFIX, sizeof(P256_SPKI_PREFIX)) != 0) { PORT_SetError(SSL_ERROR_INVALID_CHANNEL_ID_KEY); rv = SECFailure; goto loser; |