diff options
Diffstat (limited to 'nss/cmd/lib/basicutil.h')
| -rw-r--r-- | nss/cmd/lib/basicutil.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nss/cmd/lib/basicutil.h b/nss/cmd/lib/basicutil.h index fec1cf4..345fd91 100644 --- a/nss/cmd/lib/basicutil.h +++ b/nss/cmd/lib/basicutil.h @@ -13,10 +13,11 @@ #include "base64.h" #include "secasn1.h" #include "secder.h" +#include "sslt.h" #include <stdio.h> #ifdef SECUTIL_NEW -typedef int (*SECU_PPFunc)(PRFileDesc *out, SECItem *item, +typedef int (*SECU_PPFunc)(PRFileDesc *out, SECItem *item, char *msg, int level); #else typedef int (*SECU_PPFunc)(FILE *out, SECItem *item, char *msg, int level); @@ -62,7 +63,7 @@ extern int SECU_PrintPrivateKey(FILE *out, SECItem *der, char *m, int level); extern SECStatus SECU_PKCS11Init(PRBool readOnly); /* Dump contents of signed data */ -extern int SECU_PrintSignedData(FILE *out, SECItem *der, const char *m, +extern int SECU_PrintSignedData(FILE *out, SECItem *der, const char *m, int level, SECU_PPFunc inner); extern void SECU_PrintString(FILE *out, const SECItem *si, const char *m, @@ -73,16 +74,16 @@ extern void SECU_PrintPRandOSError(const char *progName); /* Caller ensures that dst is at least item->len*2+1 bytes long */ void -SECU_SECItemToHex(const SECItem * item, char * dst); +SECU_SECItemToHex(const SECItem *item, char *dst); /* Requires 0x prefix. Case-insensitive. Will do in-place replacement if * successful */ SECStatus -SECU_SECItemHexStringToBinary(SECItem* srcdest); +SECU_SECItemHexStringToBinary(SECItem *srcdest); /* * - * Utilities for parsing security tools command lines + * Utilities for parsing security tools command lines * */ @@ -106,12 +107,16 @@ typedef struct } secuCommand; /* fill the "arg" and "activated" fields for each flag */ -SECStatus +SECStatus SECU_ParseCommandLine(int argc, char **argv, char *progName, - const secuCommand *cmd); + const secuCommand *cmd); char * SECU_GetOptionArg(const secuCommand *cmd, int optionNum); +SECStatus parseGroupList(const char *arg, SSLNamedGroup **enabledGroups, + unsigned int *enabledGroupsCount); +SSLNamedGroup groupNameToNamedGroup(char *name); + /* * * Error messaging |