diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/cmd/lib/basicutil.h | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/cmd/lib/basicutil.h')
| -rw-r--r-- | security/nss/cmd/lib/basicutil.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/security/nss/cmd/lib/basicutil.h b/security/nss/cmd/lib/basicutil.h index 345fd91a4..de8c1b01e 100644 --- a/security/nss/cmd/lib/basicutil.h +++ b/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 @@ -82,6 +82,14 @@ 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 |