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

Side by Side Diff: net/third_party/nss/patches/peercertchain.patch

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make the changes rsleevi suggested Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 diff -pu -r a/net/third_party/nss/ssl/sslauth.c b/net/third_party/nss/ssl/sslaut h.c 1 diff -pu a/nss/lib/ssl/sslauth.c b/nss/lib/ssl/sslauth.c
2 --- a/net/third_party/nss/ssl/sslauth.c»2012-04-25 07:50:12.000000000 -0700 2 --- a/nss/lib/ssl/sslauth.c» 2013-04-27 09:17:17.216390477 -0700
3 +++ b/net/third_party/nss/ssl/sslauth.c»2012-11-09 15:22:49.448098805 -0800 3 +++ b/nss/lib/ssl/sslauth.c» 2013-04-27 09:20:21.318997488 -0700
4 @@ -28,6 +28,41 @@ SSL_PeerCertificate(PRFileDesc *fd) 4 @@ -29,6 +29,41 @@ SSL_PeerCertificate(PRFileDesc *fd)
5 } 5 }
6 6
7 /* NEED LOCKS IN HERE. */ 7 /* NEED LOCKS IN HERE. */
8 +SECStatus 8 +SECStatus
9 +SSL_PeerCertificateChain(PRFileDesc *fd, CERTCertificate **certs, 9 +SSL_PeerCertificateChain(PRFileDesc *fd, CERTCertificate **certs,
10 + unsigned int *numCerts, unsigned int maxNumCerts) 10 + unsigned int *numCerts, unsigned int maxNumCerts)
11 +{ 11 +{
12 + sslSocket *ss; 12 + sslSocket *ss;
13 + ssl3CertNode* cur; 13 + ssl3CertNode* cur;
14 + 14 +
(...skipping 21 matching lines...) Expand all
36 + (*numCerts)++; 36 + (*numCerts)++;
37 + } 37 + }
38 + 38 +
39 + return SECSuccess; 39 + return SECSuccess;
40 +} 40 +}
41 + 41 +
42 +/* NEED LOCKS IN HERE. */ 42 +/* NEED LOCKS IN HERE. */
43 CERTCertificate * 43 CERTCertificate *
44 SSL_LocalCertificate(PRFileDesc *fd) 44 SSL_LocalCertificate(PRFileDesc *fd)
45 { 45 {
46 diff -pu -r a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h 46 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
47 --- a/net/third_party/nss/ssl/ssl.h» 2012-09-21 14:58:43.000000000 -0700 47 --- a/nss/lib/ssl/ssl.h»2013-04-27 09:17:17.216390477 -0700
48 +++ b/net/third_party/nss/ssl/ssl.h» 2012-11-09 15:22:49.448098805 -0800 48 +++ b/nss/lib/ssl/ssl.h»2013-04-27 09:20:21.318997488 -0700
49 @@ -398,6 +398,18 @@ SSL_IMPORT SECStatus SSL_SecurityStatus( 49 @@ -428,6 +428,18 @@ SSL_SetStapledOCSPResponses(PRFileDesc *
50 SSL_IMPORT CERTCertificate *SSL_PeerCertificate(PRFileDesc *fd); 50 » » » PRBool takeOwnership);
51 51
52 /* 52 /*
53 +** Return references to the certificates presented by the SSL peer. 53 +** Return references to the certificates presented by the SSL peer.
54 +** |maxNumCerts| must contain the size of the |certs| array. On successful 54 +** |maxNumCerts| must contain the size of the |certs| array. On successful
55 +** return, |*numCerts| contains the number of certificates available and 55 +** return, |*numCerts| contains the number of certificates available and
56 +** |certs| will contain references to as many certificates as would fit. 56 +** |certs| will contain references to as many certificates as would fit.
57 +** Therefore if |*numCerts| contains a value less than or equal to 57 +** Therefore if |*numCerts| contains a value less than or equal to
58 +** |maxNumCerts|, then all certificates were returned. 58 +** |maxNumCerts|, then all certificates were returned.
59 +*/ 59 +*/
60 +SSL_IMPORT SECStatus SSL_PeerCertificateChain( 60 +SSL_IMPORT SECStatus SSL_PeerCertificateChain(
61 + PRFileDesc *fd, CERTCertificate **certs, 61 + PRFileDesc *fd, CERTCertificate **certs,
62 + unsigned int *numCerts, unsigned int maxNumCerts); 62 + unsigned int *numCerts, unsigned int maxNumCerts);
63 + 63 +
64 +/* 64 +/*
65 ** Authenticate certificate hook. Called when a certificate comes in 65 ** Authenticate certificate hook. Called when a certificate comes in
66 ** (because of SSL_REQUIRE_CERTIFICATE in SSL_Enable) to authenticate the 66 ** (because of SSL_REQUIRE_CERTIFICATE in SSL_Enable) to authenticate the
67 ** certificate. 67 ** certificate.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698