diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-05-02 10:50:38 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-05-02 10:50:38 +0200 |
| commit | 487552a3647734b575332ced98ea2e0f6876adfd (patch) | |
| tree | ef6298dde88ac5b06b53184b87ea020d72f5c035 /lib/ssl/sslsnce.c | |
| parent | b88292088a2de40bd88b6460fda22d7edcb03293 (diff) | |
| download | nss-hg-487552a3647734b575332ced98ea2e0f6876adfd.tar.gz | |
Bug 1204998 - clang-format 3.8 on libssl without manual modifications, r=mt
Diffstat (limited to 'lib/ssl/sslsnce.c')
| -rw-r--r-- | lib/ssl/sslsnce.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c index bcadb242b..c3f6aa3d5 100644 --- a/lib/ssl/sslsnce.c +++ b/lib/ssl/sslsnce.c @@ -105,17 +105,17 @@ struct sidCacheEntryStr { /* 72 - common header total */ union { -struct { - /* 2 */ ssl3CipherSuite cipherSuite; - /* 2 */ PRUint16 compression; /* SSLCompressionMethod */ + struct { + /* 2 */ ssl3CipherSuite cipherSuite; + /* 2 */ PRUint16 compression; /* SSLCompressionMethod */ - /* 54 */ ssl3SidKeys keys; /* keys, wrapped as needed. */ + /* 54 */ ssl3SidKeys keys; /* keys, wrapped as needed. */ - /* 4 */ PRUint32 masterWrapMech; - /* 4 */ PRInt32 certIndex; - /* 4 */ PRInt32 srvNameIndex; - /* 32 */ PRUint8 srvNameHash[SHA256_LENGTH]; /* SHA256 name hash */ - /* 2 */ PRUint16 certTypeArgs; + /* 4 */ PRUint32 masterWrapMech; + /* 4 */ PRInt32 certIndex; + /* 4 */ PRInt32 srvNameIndex; + /* 32 */ PRUint8 srvNameHash[SHA256_LENGTH]; /* SHA256 name hash */ + /* 2 */ PRUint16 certTypeArgs; /*104 */} ssl3; /* force sizeof(sidCacheEntry) to be a multiple of cache line size */ @@ -451,7 +451,7 @@ ConvertFromSID(sidCacheEntry *to, sslSessionID *from) PORT_Memcpy(to->sessionID, from->u.ssl3.sessionID, to->sessionIDLength); to->u.ssl3.certTypeArgs = 0U; - switch(from->authType) { + switch (from->authType) { #ifndef NSS_DISABLE_ECC case ssl_auth_ecdsa: case ssl_auth_ecdh_rsa: @@ -463,7 +463,6 @@ ConvertFromSID(sidCacheEntry *to, sslSessionID *from) break; } - SSL_TRC(8, ("%d: SSL3: ConvertSID: time=%d addr=0x%08x%08x%08x%08x " "cipherSuite=%d", myPid, to->creationTime, to->addr.pr_s6_addr32[0], @@ -1040,7 +1039,7 @@ InitCache(cacheDesc *cache, int maxCacheEntries, int maxCertCacheEntries, } if (shared) { - /* Create file names */ +/* Create file names */ #if defined(XP_UNIX) || defined(XP_BEOS) /* there's some confusion here about whether PR_OpenAnonFileMap wants ** a directory name or a file name for its first argument. @@ -1667,8 +1666,8 @@ ssl_GetWrappingKey(PRInt32 symWrapMechIndex, { PRBool rv; - PORT_Assert( (unsigned)authType < ssl_auth_size); - PORT_Assert( (unsigned)symWrapMechIndex < SSL_NUM_WRAP_MECHS); + PORT_Assert((unsigned)authType < ssl_auth_size); + PORT_Assert((unsigned)symWrapMechIndex < SSL_NUM_WRAP_MECHS); if ((unsigned)authType < ssl_auth_size && (unsigned)symWrapMechIndex < SSL_NUM_WRAP_MECHS) { rv = getSvrWrappingKey(symWrapMechIndex, authType, wswk, |