summaryrefslogtreecommitdiff
path: root/nss-tool/common/util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'nss-tool/common/util.cc')
-rw-r--r--nss-tool/common/util.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/nss-tool/common/util.cc b/nss-tool/common/util.cc
index 5b7ed0b9d..e5af2cb8a 100644
--- a/nss-tool/common/util.cc
+++ b/nss-tool/common/util.cc
@@ -74,15 +74,15 @@ static char *GetModulePassword(PK11SlotInfo *slot, int retry, void *arg) {
return nullptr;
}
-static std::vector<char> ReadFromIstream(std::istream &is) {
- std::vector<char> certData;
+static std::vector<uint8_t> ReadFromIstream(std::istream &is) {
+ std::vector<uint8_t> data;
while (is) {
char buf[1024];
is.read(buf, sizeof(buf));
- certData.insert(certData.end(), buf, buf + is.gcount());
+ data.insert(data.end(), buf, buf + is.gcount());
}
- return certData;
+ return data;
}
static std::string GetNewPasswordFromUser(void) {
@@ -181,8 +181,8 @@ std::string StringToHex(const ScopedSECItem &input) {
return ss.str();
}
-std::vector<char> ReadInputData(std::string &dataPath) {
- std::vector<char> data;
+std::vector<uint8_t> ReadInputData(std::string dataPath) {
+ std::vector<uint8_t> data;
if (dataPath.empty()) {
std::cout << "No input file path given, using stdin." << std::endl;
data = ReadFromIstream(std::cin);