diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 23:58:21 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 23:58:21 +0000 |
| commit | b5eb18e5328f93642c1fad5dfb240d98b4c68251 (patch) | |
| tree | 34afdb6ef54de3a93ed5063e6d0add71cd19c07f /net/third_party | |
| parent | 379e302bac111738d2d8afa38f555b227458b24c (diff) | |
| download | chromium_src-b5eb18e5328f93642c1fad5dfb240d98b4c68251.zip chromium_src-b5eb18e5328f93642c1fad5dfb240d98b4c68251.tar.gz chromium_src-b5eb18e5328f93642c1fad5dfb240d98b4c68251.tar.bz2 | |
Replace the deprecated DSA_SIGNATURE_LEN macro with
DSA1_SIGNATURE_LEN.
R=rsleevi@chromium.org
BUG=151692
TEST=no compilation error
Review URL: https://chromiumcodereview.appspot.com/10969058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index b8f9886..caf9c78 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -69,6 +69,14 @@ #include "zlib.h" #endif +/* DSA_SIGNATURE_LEN is deprecated and replaced by DSA1_SIGNATURE_LEN + * in NSS 3.14. Provide a backup definition when compiling against an + * older system NSS library. + */ +#ifndef DSA1_SIGNATURE_LEN +#define DSA1_SIGNATURE_LEN 40 /* Bytes */ +#endif + #ifndef PK11_SETATTRS #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \ (x)->pValue=(v); (x)->ulValueLen = (l); @@ -912,7 +920,7 @@ ssl3_VerifySignedHashes(SSL3Hashes *hash, CERTCertificate *cert, hashItem.data = hash->sha; hashItem.len = sizeof(hash->sha); /* Allow DER encoded DSA signatures in SSL 3.0 */ - if (isTLS || buf->len != DSA_SIGNATURE_LEN) { + if (isTLS || buf->len != DSA1_SIGNATURE_LEN) { signature = DSAU_DecodeDerSig(buf); if (!signature) { PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE); |