diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | net/cert/x509_util_nss.cc | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -39,7 +39,7 @@ vars = { # and V8 without interference from each other. "webrtc_revision": "3853", "jsoncpp_revision": "248", - "nss_revision": "195619", + "nss_revision": "196262", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarm_client # and whatever else without interference from each other. diff --git a/net/cert/x509_util_nss.cc b/net/cert/x509_util_nss.cc index 90b7487..bf08681 100644 --- a/net/cert/x509_util_nss.cc +++ b/net/cert/x509_util_nss.cc @@ -365,7 +365,12 @@ bool CreateDomainBoundCertEC( #if defined(USE_NSS) || defined(OS_IOS) void ParsePrincipal(CERTName* name, CertPrincipal* principal) { +// Starting in NSS 3.15, CERTGetNameFunc takes a const CERTName* argument. +#if NSS_VMINOR >= 15 + typedef char* (*CERTGetNameFunc)(const CERTName* name); +#else typedef char* (*CERTGetNameFunc)(CERTName* name); +#endif // TODO(jcampan): add business_category and serial_number. // TODO(wtc): NSS has the CERT_GetOrgName, CERT_GetOrgUnitName, and |