diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:01:07 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:01:07 +0000 |
| commit | a281a3821add6b84784793ded4d0cb577c7e7e0e (patch) | |
| tree | e5339edc1bb3beaf43abadbc2d2417a33a424752 /net/cert | |
| parent | 42a91de5c4a71693ef9c822c967231c7c156b2c1 (diff) | |
| download | chromium_src-a281a3821add6b84784793ded4d0cb577c7e7e0e.zip chromium_src-a281a3821add6b84784793ded4d0cb577c7e7e0e.tar.gz chromium_src-a281a3821add6b84784793ded4d0cb577c7e7e0e.tar.bz2 | |
Update nss_revision to r196262 to pick up NSS_3_15_BETA2.
The underlying CLs are:
https://codereview.chromium.org/14166011/
https://codereview.chromium.org/13898013/
Handle the new CERTGetNameFunc function prototype in NSS 3.15.
R=agl@chromium.org,rsleevi@chromium.org
BUG=233732
TEST=no build errors on iOS, Mac OS X, and Windows.
Review URL: https://chromiumcodereview.appspot.com/14263026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert')
| -rw-r--r-- | net/cert/x509_util_nss.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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 |