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

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

Issue 22626003: Check if there is no window in LockSystemModalContainer when unlocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ndebug Created 7 years, 4 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 | « ash/shell.cc ('k') | 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
diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c
index 98e31d4ec68471f7f6148970ebd902fce60f9b94..c2d6c8bbd5d0352dfde919122c53b43a50900972 100644
--- a/net/third_party/nss/ssl/ssl3con.c
+++ b/net/third_party/nss/ssl/ssl3con.c
@@ -49,6 +49,12 @@
#define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
(x)->pValue=(v); (x)->ulValueLen = (l);
#endif
+#ifndef PR_ARRAY_SIZE
James Cook 2013/08/09 20:11:39 Did you mean to change this?
+#define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+#endif
+#ifndef PR_ARRAY_SIZE
+#define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+#endif
static SECStatus ssl3_AuthCertificate(sslSocket *ss);
static void ssl3_CleanupPeerCerts(sslSocket *ss);
@@ -4075,7 +4081,9 @@ static const struct {
} tlsHashOIDMap[] = {
{ tls_hash_md5, SEC_OID_MD5 },
{ tls_hash_sha1, SEC_OID_SHA1 },
+#if defined(SEC_OID_SHA224)
{ tls_hash_sha224, SEC_OID_SHA224 },
+#endif
{ tls_hash_sha256, SEC_OID_SHA256 },
{ tls_hash_sha384, SEC_OID_SHA384 },
{ tls_hash_sha512, SEC_OID_SHA512 }
« no previous file with comments | « ash/shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698