diff options
| author | wtc%google.com <devnull@localhost> | 2008-02-14 16:32:22 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2008-02-14 16:32:22 +0000 |
| commit | 611cd0721391af107e6b7029c6c867206bb130f2 (patch) | |
| tree | 21f354c3075adee83d71132987e8fa59c44cd6b9 | |
| parent | c5ce12514f605ed0293973effb918616469a0967 (diff) | |
| download | nss-hg-611cd0721391af107e6b7029c6c867206bb130f2.tar.gz | |
Made ssl3stats static again. We should rename it if we want to make it
extern.
Modified files: ssl3con.c ssl3ext.c sslimpl.h
| -rw-r--r-- | security/nss/lib/ssl/ssl3con.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/ssl/ssl3ext.c | 4 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslimpl.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index a0845e6ef..4fe59fb68 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -209,7 +209,7 @@ PRBool ssl3_global_policy_some_restricted = PR_FALSE; ** SSL_ConfigSecureServer(), and is used in ssl3_SendCertificateRequest(). */ CERTDistNames *ssl3_server_ca_list = NULL; -SSL3Statistics ssl3stats; +static SSL3Statistics ssl3stats; /* indexed by SSL3BulkCipher */ static const ssl3BulkCipherDef bulk_cipher_defs[] = { diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c index bb33b5d8b..fd84964c1 100644 --- a/security/nss/lib/ssl/ssl3ext.c +++ b/security/nss/lib/ssl/ssl3ext.c @@ -736,6 +736,7 @@ ssl3_ServerHandleSessionTicketExt(sslSocket *ss, PRUint16 ex_type, SECItem *decrypted_state = NULL; SessionTicket *parsed_session_ticket = NULL; sslSessionID *sid = NULL; + SSL3Statistics *ssl3stats; /* Ignore the SessionTicket extension if processing is disabled. */ if (!ss->opt.enableSessionTickets) @@ -1094,7 +1095,8 @@ ssl3_ServerHandleSessionTicketExt(sslSocket *ss, PRUint16 ex_type, no_ticket: SSL_DBG(("%d: SSL[%d]: Session ticket parsing failed.", SSL_GETPID(), ss->fd)); - SSL_AtomicIncrementLong(& ssl3stats.hch_sid_ticket_parse_failures ); + ssl3stats = SSL_GetStatistics(); + SSL_AtomicIncrementLong(& ssl3stats->hch_sid_ticket_parse_failures ); if (sid) { ssl_FreeSID(sid); sid = NULL; diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h index 4ad4da15e..082586252 100644 --- a/security/nss/lib/ssl/sslimpl.h +++ b/security/nss/lib/ssl/sslimpl.h @@ -1111,9 +1111,6 @@ extern sslSessionIDLookupFunc ssl_sid_lookup; extern sslSessionIDCacheFunc ssl_sid_cache; extern sslSessionIDUncacheFunc ssl_sid_uncache; -/* Protected using atomic operations. */ -extern SSL3Statistics ssl3stats; - /************************************************************************/ SEC_BEGIN_PROTOS |