diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-01-26 06:41:37 +0900 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-01-26 06:41:37 +0900 |
| commit | 1aaea1ef4ff9a9d5e77badd418b07060bb0e9de1 (patch) | |
| tree | 740e79d5dc03ad0df0535b775a621d618fa1c569 /gtests/ssl_gtest/libssl_internals.c | |
| parent | 4b6df262a3d4f54e4a1f631d1e4c8973e9b22d86 (diff) | |
| download | nss-hg-1aaea1ef4ff9a9d5e77badd418b07060bb0e9de1.tar.gz | |
Bug 1325035 - Streamline session ticket key wrapping, r=ttaubert
Differential Revision: https://nss-review.dev.mozaws.net/D127
Diffstat (limited to 'gtests/ssl_gtest/libssl_internals.c')
| -rw-r--r-- | gtests/ssl_gtest/libssl_internals.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtests/ssl_gtest/libssl_internals.c b/gtests/ssl_gtest/libssl_internals.c index 08af9af0e..14b5257f8 100644 --- a/gtests/ssl_gtest/libssl_internals.c +++ b/gtests/ssl_gtest/libssl_internals.c @@ -62,10 +62,7 @@ PRBool SSLInt_ExtensionNegotiated(PRFileDesc *fd, PRUint16 ext) { return (PRBool)(ss && ssl3_ExtensionNegotiated(ss, ext)); } -void SSLInt_ClearSessionTicketKey() { - ssl3_SessionTicketShutdown(NULL, NULL); - NSS_UnregisterShutdown(ssl3_SessionTicketShutdown, NULL); -} +void SSLInt_ClearSessionTicketKey() { ssl_ResetSessionTicketKeys(); } SECStatus SSLInt_SetMTU(PRFileDesc *fd, PRUint16 mtu) { sslSocket *ss = ssl_FindSocket(fd); @@ -209,7 +206,7 @@ PRBool SSLInt_HasCertWithAuthType(PRFileDesc *fd, SSLAuthType authType) { return PR_FALSE; } - return (PRBool)(!!ssl_FindServerCertByAuthType(ss, authType)); + return (PRBool)(!!ssl_FindServerCert(ss, authType, NULL)); } PRBool SSLInt_SendAlert(PRFileDesc *fd, uint8_t level, uint8_t type) { |