Bug 1792821 - Updating the clang-format version to 10. r=jschanck

Differential Revision: https://phabricator.services.mozilla.com/D158323

6 files changed, 122 insertions, 159 deletions

diff --git a/lib/pk11wrap/debug_module.c b/lib/pk11wrap/debug_module.c
index f29e9810d..6f0662c7a 100644
--- a/lib/pk11wrap/debug_module.c
+++ b/lib/pk11wrap/debug_module.c
@@ -714,16 +714,14 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
         case CKA_WRAP:
             if (attr->ulValueLen > 0 && attr->pValue) {
                 CK_BBOOL tf = *((CK_BBOOL *)attr->pValue);
-                PR_LOG(modlog, 4, (fmt_s_s_d,
-                                   atype, tf ? "CK_TRUE" : "CK_FALSE", attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_s_d, atype, tf ? "CK_TRUE" : "CK_FALSE", attr->ulValueLen));
                 break;
             }
         case CKA_CLASS:
             if (attr->ulValueLen > 0 && attr->pValue) {
                 CK_OBJECT_CLASS objClass = *((CK_OBJECT_CLASS *)attr->pValue);
                 get_obj_class(objClass, valstr, sizeof valstr);
-                PR_LOG(modlog, 4, (fmt_s_s_d,
-                                   atype, valstr, attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_s_d, atype, valstr, attr->ulValueLen));
                 break;
             }
         case CKA_TRUST_CLIENT_AUTH:
@@ -733,16 +731,14 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
             if (attr->ulValueLen > 0 && attr->pValue) {
                 CK_TRUST trust = *((CK_TRUST *)attr->pValue);
                 get_trust_val(trust, valstr, sizeof valstr);
-                PR_LOG(modlog, 4, (fmt_s_s_d,
-                                   atype, valstr, attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_s_d, atype, valstr, attr->ulValueLen));
                 break;
             }
         case CKA_KEY_TYPE:
             if (attr->ulValueLen > 0 && attr->pValue) {
                 CK_KEY_TYPE keyType = *((CK_KEY_TYPE *)attr->pValue);
                 get_key_type(keyType, valstr, sizeof valstr);
-                PR_LOG(modlog, 4, (fmt_s_s_d,
-                                   atype, valstr, attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_s_d, atype, valstr, attr->ulValueLen));
                 break;
             }
         case CKA_PIXEL_X:
@@ -770,16 +766,14 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
             if (attr->ulValueLen > 0 && attr->pValue) {
                 len = PR_MIN(attr->ulValueLen + 1, sizeof valstr);
                 PR_snprintf(valstr, len, "%s", attr->pValue);
-                PR_LOG(modlog, 4, (fmt_s_qsq_d,
-                                   atype, valstr, attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_qsq_d, atype, valstr, attr->ulValueLen));
                 break;
             }
         case CKA_PROFILE_ID:
             if (attr->ulValueLen > 0 && attr->pValue) {
                 CK_PROFILE_ID profile = *((CK_PROFILE_ID *)attr->pValue);
                 get_profile_val(profile, valstr, sizeof valstr);
-                PR_LOG(modlog, 4, (fmt_s_s_d,
-                                   atype, valstr, attr->ulValueLen));
+                PR_LOG(modlog, 4, (fmt_s_s_d, atype, valstr, attr->ulValueLen));
                 break;
             }
         case CKA_ISSUER:
@@ -792,8 +786,7 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
                 derName.len = attr->ulValueLen;
                 asciiName = CERT_DerNameToAscii(&derName);
                 if (asciiName) {
-                    PR_LOG(modlog, 4, (fmt_s_s_d,
-                                       atype, asciiName, attr->ulValueLen));
+                    PR_LOG(modlog, 4, (fmt_s_s_d, atype, asciiName, attr->ulValueLen));
                     PORT_Free(asciiName);
                     break;
                 }
@@ -814,8 +807,7 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
                 if (!len) { /* entire string is printable */
                     len = PR_MIN(attr->ulValueLen + 1, sizeof valstr);
                     PR_snprintf(valstr, len, "%s", attr->pValue);
-                    PR_LOG(modlog, 4, (fmt_s_qsq_d,
-                                       atype, valstr, attr->ulValueLen));
+                    PR_LOG(modlog, 4, (fmt_s_qsq_d, atype, valstr, attr->ulValueLen));
                     break;
                 }
                 /* else fall through and treat like a binary buffer */
@@ -832,15 +824,13 @@ print_attr_value(CK_ATTRIBUTE_PTR attr)
 
                 hexBuf = CERT_Hexify(&attrBuf, PR_FALSE);
                 if (hexBuf) {
-                    PR_LOG(modlog, 4, (fmt_s_s_d,
-                                       atype, hexBuf, attr->ulValueLen));
+                    PR_LOG(modlog, 4, (fmt_s_s_d, atype, hexBuf, attr->ulValueLen));
                     PORT_Free(hexBuf);
                     break;
                 }
                 /* else fall through and show only the address. :( */
             }
-            PR_LOG(modlog, 4, ("    %s = [0x%p] [%d]",
-                               atype, attr->pValue, attr->ulValueLen));
+            PR_LOG(modlog, 4, ("    %s = [0x%p] [%d]", atype, attr->pValue, attr->ulValueLen));
             break;
     }
 }
@@ -1118,15 +1108,10 @@ NSSDBGC_GetInfo(
     rv = module_functions->C_GetInfo(pInfo);
     nssdbg_finish_time(FUNC_C_GETINFO, start);
     if (rv == CKR_OK) {
-        PR_LOG(modlog, 4, ("  cryptoki version: %d.%d",
-                           pInfo->cryptokiVersion.major,
-                           pInfo->cryptokiVersion.minor));
+        PR_LOG(modlog, 4, ("  cryptoki version: %d.%d", pInfo->cryptokiVersion.major, pInfo->cryptokiVersion.minor));
         PR_LOG(modlog, 4, (fmt_manufacturerID, pInfo->manufacturerID));
-        PR_LOG(modlog, 4, ("  library description = \"%.32s\"",
-                           pInfo->libraryDescription));
-        PR_LOG(modlog, 4, ("  library version: %d.%d",
-                           pInfo->libraryVersion.major,
-                           pInfo->libraryVersion.minor));
+        PR_LOG(modlog, 4, ("  library description = \"%.32s\"", pInfo->libraryDescription));
+        PR_LOG(modlog, 4, ("  library version: %d.%d", pInfo->libraryVersion.major, pInfo->libraryVersion.minor));
     }
     log_rv(rv);
     return rv;
@@ -1187,19 +1172,11 @@ NSSDBGC_GetSlotInfo(
     rv = module_functions->C_GetSlotInfo(slotID, pInfo);
     nssdbg_finish_time(FUNC_C_GETSLOTINFO, start);
     if (rv == CKR_OK) {
-        PR_LOG(modlog, 4, ("  slotDescription = \"%.64s\"",
-                           pInfo->slotDescription));
+        PR_LOG(modlog, 4, ("  slotDescription = \"%.64s\"", pInfo->slotDescription));
         PR_LOG(modlog, 4, (fmt_manufacturerID, pInfo->manufacturerID));
-        PR_LOG(modlog, 4, ("  flags = %s %s %s",
-                           pInfo->flags & CKF_HW_SLOT ? "CKF_HW_SLOT" : "",
-                           pInfo->flags & CKF_REMOVABLE_DEVICE ? "CKF_REMOVABLE_DEVICE" : "",
-                           pInfo->flags & CKF_TOKEN_PRESENT ? "CKF_TOKEN_PRESENT" : ""));
-        PR_LOG(modlog, 4, (fmt_hwVersion,
-                           pInfo->hardwareVersion.major,
-                           pInfo->hardwareVersion.minor));
-        PR_LOG(modlog, 4, (fmt_fwVersion,
-                           pInfo->firmwareVersion.major,
-                           pInfo->firmwareVersion.minor));
+        PR_LOG(modlog, 4, ("  flags = %s %s %s", pInfo->flags & CKF_HW_SLOT ? "CKF_HW_SLOT" : "", pInfo->flags & CKF_REMOVABLE_DEVICE ? "CKF_REMOVABLE_DEVICE" : "", pInfo->flags & CKF_TOKEN_PRESENT ? "CKF_TOKEN_PRESENT" : ""));
+        PR_LOG(modlog, 4, (fmt_hwVersion, pInfo->hardwareVersion.major, pInfo->hardwareVersion.minor));
+        PR_LOG(modlog, 4, (fmt_fwVersion, pInfo->firmwareVersion.major, pInfo->firmwareVersion.minor));
     }
     log_rv(rv);
     return rv;
@@ -1223,23 +1200,12 @@ NSSDBGC_GetTokenInfo(
         PR_LOG(modlog, 4, (fmt_manufacturerID, pInfo->manufacturerID));
         PR_LOG(modlog, 4, ("  model = \"%.16s\"", pInfo->model));
         PR_LOG(modlog, 4, ("  serial = \"%.16s\"", pInfo->serialNumber));
-        PR_LOG(modlog, 4, ("  flags = %s %s %s %s",
-                           pInfo->flags & CKF_RNG ? "CKF_RNG" : "",
-                           pInfo->flags & CKF_WRITE_PROTECTED ? "CKF_WRITE_PROTECTED" : "",
-                           pInfo->flags & CKF_LOGIN_REQUIRED ? "CKF_LOGIN_REQUIRED" : "",
-                           pInfo->flags & CKF_USER_PIN_INITIALIZED ? "CKF_USER_PIN_INIT" : ""));
-        PR_LOG(modlog, 4, ("  maxSessions = %u, Sessions = %u",
-                           pInfo->ulMaxSessionCount, pInfo->ulSessionCount));
-        PR_LOG(modlog, 4, ("  maxRwSessions = %u, RwSessions = %u",
-                           pInfo->ulMaxRwSessionCount,
-                           pInfo->ulRwSessionCount));
+        PR_LOG(modlog, 4, ("  flags = %s %s %s %s", pInfo->flags & CKF_RNG ? "CKF_RNG" : "", pInfo->flags & CKF_WRITE_PROTECTED ? "CKF_WRITE_PROTECTED" : "", pInfo->flags & CKF_LOGIN_REQUIRED ? "CKF_LOGIN_REQUIRED" : "", pInfo->flags & CKF_USER_PIN_INITIALIZED ? "CKF_USER_PIN_INIT" : ""));
+        PR_LOG(modlog, 4, ("  maxSessions = %u, Sessions = %u", pInfo->ulMaxSessionCount, pInfo->ulSessionCount));
+        PR_LOG(modlog, 4, ("  maxRwSessions = %u, RwSessions = %u", pInfo->ulMaxRwSessionCount, pInfo->ulRwSessionCount));
         /* ignore Max & Min Pin Len, Public and Private Memory */
-        PR_LOG(modlog, 4, (fmt_hwVersion,
-                           pInfo->hardwareVersion.major,
-                           pInfo->hardwareVersion.minor));
-        PR_LOG(modlog, 4, (fmt_fwVersion,
-                           pInfo->firmwareVersion.major,
-                           pInfo->firmwareVersion.minor));
+        PR_LOG(modlog, 4, (fmt_hwVersion, pInfo->hardwareVersion.major, pInfo->hardwareVersion.minor));
+        PR_LOG(modlog, 4, (fmt_fwVersion, pInfo->firmwareVersion.major, pInfo->firmwareVersion.minor));
     }
     log_rv(rv);
     return rv;
@@ -1441,9 +1407,7 @@ NSSDBGC_GetSessionInfo(
     if (rv == CKR_OK) {
         PR_LOG(modlog, 4, (fmt_slotID, pInfo->slotID));
         log_state(pInfo->state);
-        PR_LOG(modlog, 4, ("  flags = %s %s",
-                           pInfo->flags & CKF_RW_SESSION ? "CKF_RW_SESSION" : "",
-                           pInfo->flags & CKF_SERIAL_SESSION ? "CKF_SERIAL_SESSION" : ""));
+        PR_LOG(modlog, 4, ("  flags = %s %s", pInfo->flags & CKF_RW_SESSION ? "CKF_RW_SESSION" : "", pInfo->flags & CKF_SERIAL_SESSION ? "CKF_SERIAL_SESSION" : ""));
         PR_LOG(modlog, 4, ("  deviceError = 0x%x", pInfo->ulDeviceError));
     }
     log_rv(rv);
@@ -1728,8 +1692,7 @@ NSSDBGC_FindObjects(
     nssdbg_finish_time(FUNC_C_FINDOBJECTS, start);
     PR_LOG(modlog, 4, ("  *pulObjectCount = 0x%x", *pulObjectCount));
     for (i = 0; i < *pulObjectCount; i++) {
-        PR_LOG(modlog, 4, ("  phObject[%d] = 0x%x%s", i, phObject[i],
-                           phObject[i] ? "" : fmt_invalid_handle));
+        PR_LOG(modlog, 4, ("  phObject[%d] = 0x%x%s", i, phObject[i], phObject[i] ? "" : fmt_invalid_handle));
     }
     log_rv(rv);
     return rv;
diff --git a/lib/pk11wrap/pk11err.c b/lib/pk11wrap/pk11err.c
index 7b665dff5..8f4fd29ba 100644
--- a/lib/pk11wrap/pk11err.c
+++ b/lib/pk11wrap/pk11err.c
@@ -130,12 +130,12 @@ PK11_MapError(CK_RV rv)
 
 #else
 
-    /* clang-format off */
+            /* clang-format off */
     default :
         break;
-/* clang-format on */
-}
-return SEC_ERROR_UNKNOWN_PKCS11_ERROR;
+            /* clang-format on */
+    }
+    return SEC_ERROR_UNKNOWN_PKCS11_ERROR;
 }
 
 #endif
diff --git a/lib/pk11wrap/pk11mech.c b/lib/pk11wrap/pk11mech.c
index 685f0e934..2cf53e45d 100644
--- a/lib/pk11wrap/pk11mech.c
+++ b/lib/pk11wrap/pk11mech.c
@@ -32,9 +32,8 @@ typedef struct {
     int iv;
 } pk11MechanismData;
 
-static pk11MechanismData pk11_default =
-    { CKM_GENERIC_SECRET_KEY_GEN, CKK_GENERIC_SECRET,
-      CKM_FAKE_RANDOM, CKM_FAKE_RANDOM, 8, 8 };
+static pk11MechanismData pk11_default = { CKM_GENERIC_SECRET_KEY_GEN, CKK_GENERIC_SECRET,
+                                          CKM_FAKE_RANDOM, CKM_FAKE_RANDOM, 8, 8 };
 static pk11MechanismData *pk11_MechanismTable = NULL;
 static int pk11_MechTableSize = 0;
 static int pk11_MechEntrySize = 0;
diff --git a/lib/pk11wrap/pk11pars.c b/lib/pk11wrap/pk11pars.c
index 63ad93a3b..a3eab09be 100644
--- a/lib/pk11wrap/pk11pars.c
+++ b/lib/pk11wrap/pk11pars.c
@@ -1179,54 +1179,60 @@ secmod_ParseModuleSpecForTokens(PRBool convert, PRBool isFIPS,
         NSSUTIL_HANDLE_STRING_ARG(moduleSpec, target, "tokens=",
                                   modulePrev = moduleSpec;
                                   /* skip copying */)
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "cryptoTokenDescription=",
-                                  if (convert) { modulePrev = moduleSpec; });
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "cryptoSlotDescription=",
-                                  if (convert) { modulePrev = moduleSpec; });
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "dbTokenDescription=",
-                                  if (convert) {
-                                      modulePrev = moduleSpec;
-                                      if (!isFIPS) {
-                                          newSpecPtr = secmod_doDescCopy(newSpecPtr,
-                                                                         &newSpec, &newSpecLen,
-                                                                         SECMOD_TOKEN_DESCRIPTION,
-                                                                         sizeof(SECMOD_TOKEN_DESCRIPTION) - 1,
-                                                                         tmp);
-                                      }
-                                  });
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "dbSlotDescription=",
-                                  if (convert) {
-                                      modulePrev = moduleSpec; /* skip copying */
-                                      if (!isFIPS) {
-                                          newSpecPtr = secmod_doDescCopy(newSpecPtr,
-                                                                         &newSpec, &newSpecLen,
-                                                                         SECMOD_SLOT_DESCRIPTION,
-                                                                         sizeof(SECMOD_SLOT_DESCRIPTION) - 1,
-                                                                         tmp);
-                                      }
-                                  });
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "FIPSTokenDescription=",
-                                  if (convert) {
-                                      modulePrev = moduleSpec; /* skip copying */
-                                      if (isFIPS) {
-                                          newSpecPtr = secmod_doDescCopy(newSpecPtr,
-                                                                         &newSpec, &newSpecLen,
-                                                                         SECMOD_TOKEN_DESCRIPTION,
-                                                                         sizeof(SECMOD_TOKEN_DESCRIPTION) - 1,
-                                                                         tmp);
-                                      }
-                                  });
-        NSSUTIL_HANDLE_STRING_ARG(moduleSpec, tmp, "FIPSSlotDescription=",
-                                  if (convert) {
-                                      modulePrev = moduleSpec; /* skip copying */
-                                      if (isFIPS) {
-                                          newSpecPtr = secmod_doDescCopy(newSpecPtr,
-                                                                         &newSpec, &newSpecLen,
-                                                                         SECMOD_SLOT_DESCRIPTION,
-                                                                         sizeof(SECMOD_SLOT_DESCRIPTION) - 1,
-                                                                         tmp);
-                                      }
-                                  });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "cryptoTokenDescription=",
+            if (convert) { modulePrev = moduleSpec; });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "cryptoSlotDescription=",
+            if (convert) { modulePrev = moduleSpec; });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "dbTokenDescription=",
+            if (convert) {
+                modulePrev = moduleSpec;
+                if (!isFIPS) {
+                    newSpecPtr = secmod_doDescCopy(newSpecPtr,
+                                                   &newSpec, &newSpecLen,
+                                                   SECMOD_TOKEN_DESCRIPTION,
+                                                   sizeof(SECMOD_TOKEN_DESCRIPTION) - 1,
+                                                   tmp);
+                }
+            });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "dbSlotDescription=",
+            if (convert) {
+                modulePrev = moduleSpec; /* skip copying */
+                if (!isFIPS) {
+                    newSpecPtr = secmod_doDescCopy(newSpecPtr,
+                                                   &newSpec, &newSpecLen,
+                                                   SECMOD_SLOT_DESCRIPTION,
+                                                   sizeof(SECMOD_SLOT_DESCRIPTION) - 1,
+                                                   tmp);
+                }
+            });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "FIPSTokenDescription=",
+            if (convert) {
+                modulePrev = moduleSpec; /* skip copying */
+                if (isFIPS) {
+                    newSpecPtr = secmod_doDescCopy(newSpecPtr,
+                                                   &newSpec, &newSpecLen,
+                                                   SECMOD_TOKEN_DESCRIPTION,
+                                                   sizeof(SECMOD_TOKEN_DESCRIPTION) - 1,
+                                                   tmp);
+                }
+            });
+        NSSUTIL_HANDLE_STRING_ARG(
+            moduleSpec, tmp, "FIPSSlotDescription=",
+            if (convert) {
+                modulePrev = moduleSpec; /* skip copying */
+                if (isFIPS) {
+                    newSpecPtr = secmod_doDescCopy(newSpecPtr,
+                                                   &newSpec, &newSpecLen,
+                                                   SECMOD_SLOT_DESCRIPTION,
+                                                   sizeof(SECMOD_SLOT_DESCRIPTION) - 1,
+                                                   tmp);
+                }
+            });
         NSSUTIL_HANDLE_FINAL_ARG(moduleSpec)
         SECMOD_SPEC_COPY(newSpecPtr, modulePrev, moduleSpec);
     }
diff --git a/lib/pk11wrap/pk11pbe.c b/lib/pk11wrap/pk11pbe.c
index 21b4dd2cc..dfe4dee71 100644
--- a/lib/pk11wrap/pk11pbe.c
+++ b/lib/pk11wrap/pk11pbe.c
@@ -51,54 +51,50 @@ typedef struct sec_pkcs5V2ParameterStr sec_pkcs5V2Parameter;
  * based upon the additions in PKCS 12.  This should eventually be moved
  * if RSA updates PKCS 5.
  */
-const SEC_ASN1Template SEC_PKCS5PBEParameterTemplate[] =
-    {
-      { SEC_ASN1_SEQUENCE,
-        0, NULL, sizeof(SEC_PKCS5PBEParameter) },
-      { SEC_ASN1_OCTET_STRING,
-        offsetof(SEC_PKCS5PBEParameter, salt) },
-      { SEC_ASN1_INTEGER,
-        offsetof(SEC_PKCS5PBEParameter, iteration) },
-      { 0 }
-    };
-
-const SEC_ASN1Template SEC_V2PKCS12PBEParameterTemplate[] =
-    {
-      { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
-      { SEC_ASN1_OCTET_STRING, offsetof(SEC_PKCS5PBEParameter, salt) },
-      { SEC_ASN1_INTEGER, offsetof(SEC_PKCS5PBEParameter, iteration) },
-      { 0 }
-    };
+const SEC_ASN1Template SEC_PKCS5PBEParameterTemplate[] = {
+    { SEC_ASN1_SEQUENCE,
+      0, NULL, sizeof(SEC_PKCS5PBEParameter) },
+    { SEC_ASN1_OCTET_STRING,
+      offsetof(SEC_PKCS5PBEParameter, salt) },
+    { SEC_ASN1_INTEGER,
+      offsetof(SEC_PKCS5PBEParameter, iteration) },
+    { 0 }
+};
+
+const SEC_ASN1Template SEC_V2PKCS12PBEParameterTemplate[] = {
+    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
+    { SEC_ASN1_OCTET_STRING, offsetof(SEC_PKCS5PBEParameter, salt) },
+    { SEC_ASN1_INTEGER, offsetof(SEC_PKCS5PBEParameter, iteration) },
+    { 0 }
+};
 
 SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
 
 /* SECOID_PKCS5_PBKDF2 */
-const SEC_ASN1Template SEC_PKCS5V2PBEParameterTemplate[] =
-    {
-      { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
-      /* This is really a choice, but since we only understand this
+const SEC_ASN1Template SEC_PKCS5V2PBEParameterTemplate[] = {
+    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
+    /* This is really a choice, but since we only understand this
      * choice, just inline it */
-      { SEC_ASN1_OCTET_STRING, offsetof(SEC_PKCS5PBEParameter, salt) },
-      { SEC_ASN1_INTEGER, offsetof(SEC_PKCS5PBEParameter, iteration) },
-      { SEC_ASN1_INTEGER | SEC_ASN1_OPTIONAL,
-        offsetof(SEC_PKCS5PBEParameter, keyLength) },
-      { SEC_ASN1_POINTER | SEC_ASN1_XTRN | SEC_ASN1_OPTIONAL,
-        offsetof(SEC_PKCS5PBEParameter, pPrfAlgId),
-        SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
-      { 0 }
-    };
+    { SEC_ASN1_OCTET_STRING, offsetof(SEC_PKCS5PBEParameter, salt) },
+    { SEC_ASN1_INTEGER, offsetof(SEC_PKCS5PBEParameter, iteration) },
+    { SEC_ASN1_INTEGER | SEC_ASN1_OPTIONAL,
+      offsetof(SEC_PKCS5PBEParameter, keyLength) },
+    { SEC_ASN1_POINTER | SEC_ASN1_XTRN | SEC_ASN1_OPTIONAL,
+      offsetof(SEC_PKCS5PBEParameter, pPrfAlgId),
+      SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
+    { 0 }
+};
 
 /* SEC_OID_PKCS5_PBES2, SEC_OID_PKCS5_PBMAC1 */
-const SEC_ASN1Template SEC_PKCS5V2ParameterTemplate[] =
-    {
-      { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
-      { SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(sec_pkcs5V2Parameter, pbeAlgId),
-        SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
-      { SEC_ASN1_INLINE | SEC_ASN1_XTRN,
-        offsetof(sec_pkcs5V2Parameter, cipherAlgId),
-        SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
-      { 0 }
-    };
+const SEC_ASN1Template SEC_PKCS5V2ParameterTemplate[] = {
+    { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SEC_PKCS5PBEParameter) },
+    { SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(sec_pkcs5V2Parameter, pbeAlgId),
+      SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
+    { SEC_ASN1_INLINE | SEC_ASN1_XTRN,
+      offsetof(sec_pkcs5V2Parameter, cipherAlgId),
+      SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
+    { 0 }
+};
 
 /*
  * maps a PBE algorithm to a crypto algorithm. for PKCS12 and PKCS5v1
diff --git a/lib/pk11wrap/pk11slot.c b/lib/pk11wrap/pk11slot.c
index 1b150888d..0bd8c8d1c 100644
--- a/lib/pk11wrap/pk11slot.c
+++ b/lib/pk11wrap/pk11slot.c
@@ -198,8 +198,7 @@ PK11_AddSlotToList(PK11SlotList *list, PK11SlotInfo *slot, PRBool sorted)
     PZ_Lock(list->lock);
     element = list->head;
     /* Insertion sort, with higher cipherOrders are sorted first in the list */
-    while (element && sorted && (element->slot->module->cipherOrder >
-                                 le->slot->module->cipherOrder)) {
+    while (element && sorted && (element->slot->module->cipherOrder > le->slot->module->cipherOrder)) {
         element = element->next;
     }
     if (element) {