Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Unified Diff: net/third_party/nss/ssl/ssl3con.c

Issue 10969058: Replace the deprecated DSA_SIGNATURE_LEN macro with (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/ssl3con.c
===================================================================
--- net/third_party/nss/ssl/ssl3con.c (revision 158179)
+++ net/third_party/nss/ssl/ssl3con.c (working copy)
@@ -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 @@
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698