diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-14 14:10:11 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-08-14 14:10:11 +0200 |
| commit | f194976e811a6c717b0afe68259e75a2772782b0 (patch) | |
| tree | b480edee4273bab808c63ab766e77b0ed52e01fa /lib/cryptohi | |
| parent | f91691dddde48da951717e95026315398f5a53db (diff) | |
| download | nss-hg-f194976e811a6c717b0afe68259e75a2772782b0.tar.gz | |
Bug 1295115 - follow up to clang-format for CI, r= kaie
Diffstat (limited to 'lib/cryptohi')
| -rw-r--r-- | lib/cryptohi/keythi.h | 14 | ||||
| -rw-r--r-- | lib/cryptohi/secsign.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/cryptohi/keythi.h b/lib/cryptohi/keythi.h index e0a9215a0..bd26838eb 100644 --- a/lib/cryptohi/keythi.h +++ b/lib/cryptohi/keythi.h @@ -206,18 +206,14 @@ typedef struct SECKEYPublicKeyStr SECKEYPublicKey; #define SECKEY_ATTRIBUTES_CACHED(key) \ (0 != (key->staticflags & SECKEY_Attributes_Cached)) -#define SECKEY_ATTRIBUTE_VALUE(key,attribute) \ +#define SECKEY_ATTRIBUTE_VALUE(key, attribute) \ (0 != (key->staticflags & SECKEY_##attribute)) -#define SECKEY_HAS_ATTRIBUTE_SET(key,attribute) \ - (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? \ - (0 != (key->staticflags & SECKEY_##attribute)) : \ - PK11_HasAttributeSet(key->pkcs11Slot,key->pkcs11ID,attribute, PR_FALSE) +#define SECKEY_HAS_ATTRIBUTE_SET(key, attribute) \ + (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? (0 != (key->staticflags & SECKEY_##attribute)) : PK11_HasAttributeSet(key->pkcs11Slot, key->pkcs11ID, attribute, PR_FALSE) -#define SECKEY_HAS_ATTRIBUTE_SET_LOCK(key,attribute, haslock) \ - (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? \ - (0 != (key->staticflags & SECKEY_##attribute)) : \ - PK11_HasAttributeSet(key->pkcs11Slot,key->pkcs11ID,attribute, haslock) +#define SECKEY_HAS_ATTRIBUTE_SET_LOCK(key, attribute, haslock) \ + (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? (0 != (key->staticflags & SECKEY_##attribute)) : PK11_HasAttributeSet(key->pkcs11Slot, key->pkcs11ID, attribute, haslock) /* ** A generic key structure diff --git a/lib/cryptohi/secsign.c b/lib/cryptohi/secsign.c index 0243c2648..1bbdd5384 100644 --- a/lib/cryptohi/secsign.c +++ b/lib/cryptohi/secsign.c @@ -354,7 +354,7 @@ SEC_DerSignData(PLArenaPool *arena, SECItem *result, /* DER encode the signed data object */ rv = DER_Encode(arena, result, CERTSignedDataTemplate, &sd); - /* FALL THROUGH */ +/* FALL THROUGH */ loser: PORT_Free(it.data); |