diff options
Diffstat (limited to 'nss-tool/common/util.h')
| -rw-r--r-- | nss-tool/common/util.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nss-tool/common/util.h b/nss-tool/common/util.h index bfe6dbf70..bc2e297a4 100644 --- a/nss-tool/common/util.h +++ b/nss-tool/common/util.h @@ -5,12 +5,17 @@ #ifndef util_h__ #define util_h__ +#include "nspr.h" #include "scoped_ptrs.h" #include <secmodt.h> #include <string> #include <vector> +#ifndef PORT_Malloc +#define PORT_Malloc PR_Malloc +#endif + enum PwDataType { PW_NONE = 0, PW_FROMFILE = 1, PW_PLAINTEXT = 2 }; typedef struct { PwDataType source; @@ -21,6 +26,6 @@ bool InitSlotPassword(void); bool ChangeSlotPassword(void); bool DBLoginIfNeeded(const ScopedPK11SlotInfo &slot); std::string StringToHex(const ScopedSECItem &input); -std::vector<char> ReadInputData(std::string &dataPath); +std::vector<uint8_t> ReadInputData(std::string dataPath); #endif // util_h__ |