diff options
author | wtc%google.com <devnull@localhost> | 2008-02-03 06:19:43 +0000 |
---|---|---|
committer | wtc%google.com <devnull@localhost> | 2008-02-03 06:19:43 +0000 |
commit | 4732b732beace74371dfd0bdf55887f8a6aa7b52 (patch) | |
tree | 56fd0801ecfdfe3e83ecabd0aa7544aa5a9a73b7 | |
parent | 26da35578cf4500bba63df5e5d1bde237c0975dc (diff) | |
download | nss-hg-4732b732beace74371dfd0bdf55887f8a6aa7b52.tar.gz |
More whitespace and reformatting changes.
-rw-r--r-- | security/nss/lib/ssl/sslimpl.h | 5 | ||||
-rw-r--r-- | security/nss/lib/ssl/sslnonce.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h index bdd4dd0a8..8f7e4527e 100644 --- a/security/nss/lib/ssl/sslimpl.h +++ b/security/nss/lib/ssl/sslimpl.h @@ -1091,6 +1091,7 @@ const unsigned char * preferredCipher; }; + /* All the global data items declared here should be protected using the ** ssl_global_data_lock, which is a reader/writer lock. */ @@ -1444,8 +1445,8 @@ extern SECStatus ssl3_VerifySignedHashes(SSL3Hashes *hash, CERTCertificate *cert, SECItem *buf, PRBool isTLS, void *pwArg); extern SECStatus ssl3_CacheWrappedMasterSecret(sslSocket *ss, - sslSessionID *sid, ssl3CipherSpec *spec, - SSL3KEAType effectiveExchKeyType); + sslSessionID *sid, ssl3CipherSpec *spec, + SSL3KEAType effectiveExchKeyType); /* Functions that handle ClientHello and ServerHello extensions. */ extern SECStatus ssl3_HandleServerNameExt(sslSocket * ss, diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c index 14ec7032a..541854545 100644 --- a/security/nss/lib/ssl/sslnonce.c +++ b/security/nss/lib/ssl/sslnonce.c @@ -40,6 +40,7 @@ #include "nssrenam.h" #include "cert.h" +#include "pk11func.h" #include "secitem.h" #include "ssl.h" @@ -47,9 +48,6 @@ #include "sslproto.h" #include "nssilock.h" #include "nsslocks.h" - -#include "pk11func.h" - #if (defined(XP_UNIX) || defined(XP_WIN) || defined(_WINDOWS) || defined(XP_BEOS)) && !defined(_WIN32_WCE) #include <time.h> #endif |