Whitespace changes and reformatting to reduce diffs or improve readability.

11 files changed, 32 insertions, 38 deletions

diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index 1819b186a..2318731b5 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -2152,3 +2152,4 @@ cleanup:
     printf("selfserv: normal termination\n");
     return 0;
 }
+
diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 0bd63ec32..a0cc61934 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -1542,3 +1542,4 @@ main(int argc, char **argv)
     PR_Cleanup();
     return exitVal;
 }
+
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index 5c11fb700..8f7c12d37 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -182,9 +182,10 @@ void printSecurityInfo(PRFileDesc *fd)
 	CERT_DestroyCertificate(cert);
 	cert = NULL;
     }
-    fprintf(stderr, "%ld cache hits; %ld stateless resumes; %ld cache misses, "
-	"%ld cache not reusable\n",	ssl3stats->hsh_sid_cache_hits,
-	ssl3stats->hsh_sid_stateless_resumes,
+    fprintf(stderr,
+	"%ld cache hits; %ld stateless resumes; "
+	"%ld cache misses, %ld cache not reusable\n",
+	ssl3stats->hsh_sid_cache_hits, ssl3stats->hsh_sid_stateless_resumes,
 	ssl3stats->hsh_sid_cache_misses, ssl3stats->hsh_sid_cache_not_ok);
 }
 
@@ -592,7 +593,7 @@ int main(int argc, char **argv)
 
 	  case 'v': verbose++;	 			break;
 
-	  case 'r': renegotiate = atoi(optstate->value);			break;
+	  case 'r': renegotiate = atoi(optstate->value);	break;
 
 	  case 'w':
 		password = PORT_Strdup(optstate->value);
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 681900a8a..25fc85bf7 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -4777,12 +4777,12 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	    sid->u.ssl3.session_ticket.ticket.data != NULL)
 	    SSL_AtomicIncrementLong(& ssl3stats.hsh_sid_stateless_resumes );
 
-	ss->ssl3.hs.isResuming = PR_TRUE;
-
 	if (ssl3_ExtensionNegotiated(ss, session_ticket_xtn))
 	    ss->ssl3.hs.ws = wait_new_session_ticket;
 	else
-	    ss->ssl3.hs.ws         = wait_change_cipher;
+	    ss->ssl3.hs.ws = wait_change_cipher;
+
+	ss->ssl3.hs.isResuming = PR_TRUE;
 
 	/* copy the peer cert from the SID */
 	if (sid->peerCert != NULL) {
@@ -5665,7 +5665,7 @@ ssl3_HandleClientHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 			ss->sec.ci.peer.pr_s6_addr32[3]));
 	    if (ssl_sid_lookup) {
 		sid = (*ssl_sid_lookup)(&ss->sec.ci.peer, sidBytes.data, 
-		    sidBytes.len, ss->dbHandle);
+					sidBytes.len, ss->dbHandle);
 	    } else {
 		errCode = SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED;
 		goto loser;
@@ -5856,7 +5856,6 @@ compression_found:
 
 	ssl_GetSpecWriteLock(ss);  haveSpecWriteLock = PR_TRUE;
 	pwSpec = ss->ssl3.pwSpec;
-
 	if (sid->u.ssl3.keys.msIsWrapped) {
 	    PK11SymKey *    wrapKey; 	/* wrapping key */
 	    CK_FLAGS        keyFlags      = 0;
@@ -5926,7 +5925,6 @@ compression_found:
 	SSL_AtomicIncrementLong(& ssl3stats.hch_sid_cache_hits );
 	if (ss->statelessResume)
 	    SSL_AtomicIncrementLong(&ssl3stats.hch_sid_stateless_resumes);
-
 	ss->ssl3.hs.isResuming = PR_TRUE;
 
         ss->sec.authAlgorithm = sid->authAlgorithm;
@@ -5962,13 +5960,11 @@ compression_found:
 	    goto loser;
 	}
 
-
 	rv = ssl3_SendChangeCipherSpecs(ss);
 	if (rv != SECSuccess) {
 	    errCode = PORT_GetError();
 	    goto loser;
 	}
-
 	rv = ssl3_SendFinished(ss, 0);
 	ss->ssl3.hs.ws = wait_change_cipher;
 	if (rv != SECSuccess) {
@@ -7506,7 +7502,6 @@ ssl3_ComputeTLSFinished(ssl3CipherSpec *spec,
 
 	inData.data  = (unsigned char *)hashes->md5;
 	inData.len   = sizeof hashes[0];
-
 	outData.data = tlsFinished->verify_data;
 	outData.len  = sizeof tlsFinished->verify_data;
 	rv = TLS_PRF(&spec->msItem, label, &inData, &outData, isFIPS);
diff --git a/security/nss/lib/ssl/ssl3ecc.c b/security/nss/lib/ssl/ssl3ecc.c
index acdb86fa6..e8ddfe0cc 100644
--- a/security/nss/lib/ssl/ssl3ecc.c
+++ b/security/nss/lib/ssl/ssl3ecc.c
@@ -1094,8 +1094,7 @@ ssl3_SendSupportedPointExt(
  * Since that is all we support.  Disable ECC cipher suites if it doesn't.
  */
 SECStatus
-ssl3_HandleSupportedPointExt(sslSocket * ss, PRUint16 ex_type, 
-                             SECItem *data)
+ssl3_HandleSupportedPointExt(sslSocket *ss, PRUint16 ex_type, SECItem *data)
 {
     int i;
 
@@ -1141,8 +1140,7 @@ ECName ssl3_GetSvrCertCurveName(sslSocket *ss)
  * by the remote client, and disable all ECC cipher suites if not.
  */
 SECStatus
-ssl3_HandleSupportedCurvesExt(sslSocket * ss, PRUint16 ex_type, 
-                              SECItem *data)
+ssl3_HandleSupportedCurvesExt(sslSocket *ss, PRUint16 ex_type, SECItem *data)
 {
     PRInt32  list_len;
     PRUint32 peerCurves   = 0;
diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c
index e4b0a2d53..af79a3e08 100644
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -1165,9 +1165,7 @@ ssl3_ParseEncryptedSessionTicket(sslSocket *ss, SECItem *data,
  * ignore any extensions with unknown extension types.
  */
 SECStatus 
-ssl3_HandleHelloExtensions(sslSocket *ss, 
-                                 SSL3Opaque **b, 
-				 PRUint32 *length)
+ssl3_HandleHelloExtensions(sslSocket *ss, SSL3Opaque **b, PRUint32 *length)
 {
     const ssl3HelloExtensionHandler * handlers =
 	ss->sec.isServer ? server_handlers : client_handlers;
diff --git a/security/nss/lib/ssl/ssl3prot.h b/security/nss/lib/ssl/ssl3prot.h
index 178972ad1..ff07b6e1d 100644
--- a/security/nss/lib/ssl/ssl3prot.h
+++ b/security/nss/lib/ssl/ssl3prot.h
@@ -150,14 +150,14 @@ typedef enum {
     hello_request	= 0, 
     client_hello	= 1, 
     server_hello	= 2,
-    new_session_ticket  = 4,
+    new_session_ticket	= 4,
     certificate 	= 11, 
     server_key_exchange = 12,
     certificate_request	= 13, 
     server_hello_done	= 14,
     certificate_verify	= 15, 
     client_key_exchange	= 16, 
-    finished		= 20,
+    finished		= 20
 } SSL3HandshakeType;
 
 typedef struct {
@@ -316,9 +316,9 @@ typedef struct {
 
 /* NewSessionTicket handshake message. */
 typedef struct {
-  uint32 received_timestamp;
-  uint32 ticket_lifetime_hint;
-  SECItem  ticket;
+    uint32  received_timestamp;
+    uint32  ticket_lifetime_hint;
+    SECItem ticket;
 } NewSessionTicket;
 
 typedef enum {
@@ -331,7 +331,7 @@ typedef struct {
     union {
 	SSL3Opaque *certificate_list;
     } identity;
-}  ClientIdentity;
+} ClientIdentity;
 
 #define SESS_TICKET_KEY_NAME_PREFIX    "NSS!"
 #define SESS_TICKET_KEY_NAME_LEN       16
@@ -354,7 +354,6 @@ typedef enum {
     session_ticket_xtn           = 35
 } ExtensionType;
 
-
 #define TLS_EX_SESS_TICKET_MAC_LENGTH       32
 
 #endif /* __ssl3proto_h_ */
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index 197da937f..bdd4dd0a8 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -635,7 +635,7 @@ struct sslSessionIDStr {
 	    /* Session ticket if we have one, is sent as an extension in the
 	     * ClientHello message.  This field is used by clients.
 	     */
-	    NewSessionTicket session_ticket;
+	    NewSessionTicket  session_ticket;
 	} ssl3;
     } u;
 };
diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c
index c674e671c..14ec7032a 100644
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@@ -115,7 +115,7 @@ ssl_DestroySID(sslSessionID *sid)
     if (sid->u.ssl3.session_ticket.ticket.data) {
 	SECITEM_FreeItem(&sid->u.ssl3.session_ticket.ticket, PR_FALSE);
     }
-
+    
     PORT_ZFree(sid, sizeof(sslSessionID));
 }
 
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index b5a7279ba..4e7227bdd 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -68,8 +68,8 @@
  *     certCacheEntry           certCacheData[numCertCacheEntries];
  *     SSLWrappedSymWrappingKey keyCacheData[kt_kea_size][SSL_NUM_WRAP_MECHS];
  *     uint8                    keyNameSuffix[SESS_TICKET_KEY_VAR_NAME_LEN]
- *     encKeyCacheEntry         ticketEncKey; // Wrapped in non-bypass mode
- *     encKeyCacheEntry         ticketMacKey; // Wrapped in non-bypass mode
+ *     encKeyCacheEntry         ticketEncKey; /* Wrapped in non-bypass mode */
+ *     encKeyCacheEntry         ticketMacKey; /* Wrapped in non-bypass mode */
  *     PRBool                   ticketKeysValid;
  * } cacheMemCacheData;
  */
@@ -183,8 +183,8 @@ struct sidCacheSetStr {
 typedef struct sidCacheSetStr sidCacheSet;
 
 struct encKeyCacheEntryStr {
-    PRUint8     bytes[512];
-    PRInt32     length;
+    PRUint8	bytes[512];
+    PRInt32	length;
 };
 typedef struct encKeyCacheEntryStr encKeyCacheEntry;
 
@@ -1034,7 +1034,6 @@ InitCache(cacheDesc *cache, int maxCacheEntries, PRUint32 ssl2_timeout,
 
     cache->cacheMemSize = ptr;
 
-
     if (ssl2_timeout) {   
 	if (ssl2_timeout > MAX_SSL2_TIMEOUT) {
 	    ssl2_timeout = MAX_SSL2_TIMEOUT;
@@ -1121,8 +1120,8 @@ InitCache(cacheDesc *cache, int maxCacheEntries, PRUint32 ssl2_timeout,
     *(ptrdiff_t *)(&cache->certCacheData) += ptr;
     *(ptrdiff_t *)(&cache->keyCacheData ) += ptr;
     *(ptrdiff_t *)(&cache->ticketKeyNameSuffix) += ptr;
-    *(ptrdiff_t *)(&cache->ticketEncKey) += ptr;
-    *(ptrdiff_t *)(&cache->ticketMacKey) += ptr;
+    *(ptrdiff_t *)(&cache->ticketEncKey ) += ptr;
+    *(ptrdiff_t *)(&cache->ticketMacKey ) += ptr;
     *(ptrdiff_t *)(&cache->ticketKeysValid) += ptr;
 
     /* initialize the locks */
@@ -1404,8 +1403,8 @@ SSL_InheritMPServerSIDCacheInstance(cacheDesc *cache, const char * envString)
     *(ptrdiff_t *)(&cache->certCacheData) += ptr;
     *(ptrdiff_t *)(&cache->keyCacheData ) += ptr;
     *(ptrdiff_t *)(&cache->ticketKeyNameSuffix) += ptr;
-    *(ptrdiff_t *)(&cache->ticketEncKey) += ptr;
-    *(ptrdiff_t *)(&cache->ticketMacKey) += ptr;
+    *(ptrdiff_t *)(&cache->ticketEncKey ) += ptr;
+    *(ptrdiff_t *)(&cache->ticketMacKey ) += ptr;
     *(ptrdiff_t *)(&cache->ticketKeysValid) += ptr;
 
     cache->cacheMemMap = my.cacheMemMap;
diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c
index 96c6bf9c9..98db73a79 100644
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -762,6 +762,7 @@ SSL_OptionGet(PRFileDesc *fd, PRInt32 which, PRBool *pOn)
     case SSL_ENABLE_SESSION_TICKETS:
 	on = ss->opt.enableSessionTickets;
 	break;
+
     default:
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	rv = SECFailure;
@@ -2190,3 +2191,4 @@ loser:
     }
     return ss;
 }
+