Chromium Code Reviews| Index: net/third_party/nss/ssl/sslsock.c |
| diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c |
| index 596ca3d8e1ab0f69790bf8be05607029ec045bcb..4a16d459cbd76b7af4e3cec5ced5167d7865f584 100644 |
| --- a/net/third_party/nss/ssl/sslsock.c |
| +++ b/net/third_party/nss/ssl/sslsock.c |
| @@ -1615,6 +1615,19 @@ SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { |
| return SECSuccess; |
| } |
| +SSL_IMPORT |
|
wtc
2011/12/02 22:31:46
Remove SSL_IMPORT, and put
SECItem *
on its own
mattm
2011/12/06 00:32:01
Done.
|
| +SECItem *SSL_CertificateRequestCertTypes(PRFileDesc *fd) { |
| + sslSocket *ss = ssl_FindSocket(fd); |
| + |
| + if (!ss) { |
| + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_CertificateRequestCertTypes", |
| + SSL_GETPID(), fd)); |
| + return NULL; |
| + } |
| + |
| + return ss->requestedCertTypes; |
| +} |
| + |
| /************************************************************************/ |
| /* The following functions are the TOP LEVEL SSL functions. |
| ** They all get called through the NSPRIOMethods table below. |
| @@ -2639,4 +2652,3 @@ loser: |
| } |
| return ss; |
| } |
| - |