Update NSS to 3.32.1-RTM

security/nss/cmd/lib/basicutil.h

@@ -13,7 +13,7 @@
 #include "base64.h"
 #include "secasn1.h"
 #include "secder.h"
-#include "sslt.h"
+#include "ecl-exp.h"
 #include <stdio.h>
 
 #ifdef SECUTIL_NEW
@@ -81,6 +81,14 @@ SECU_SECItemToHex(const SECItem *item, char *dst);
 SECStatus
 SECU_SECItemHexStringToBinary(SECItem *srcdest);
 
+/*
+** Read a hex string into a SecItem.
+*/
+extern SECItem *SECU_HexString2SECItem(PLArenaPool *arena, SECItem *item,
+                                       const char *str);
+
+extern SECStatus SECU_ecName2params(ECCurveName curve, SECItem *params);
+
 /*
  *
  *  Utilities for parsing security tools command lines
@@ -113,10 +121,6 @@ SECU_ParseCommandLine(int argc, char **argv, char *progName,
 char *
 SECU_GetOptionArg(const secuCommand *cmd, int optionNum);
 
-SECStatus parseGroupList(const char *arg, SSLNamedGroup **enabledGroups,
-                         unsigned int *enabledGroupsCount);
-SSLNamedGroup groupNameToNamedGroup(char *name);
-
 /*
  *
  *  Error messaging