aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-20 15:07:10 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-20 15:07:10 +0100
commitacae4e84386056e80eb4bb633fcdf03375c087ea (patch)
tree77a488d87eccbbd485cf19126a10082d00f377f1
parent9ac6ab0f1c8ca1467ef2e3b2c6e51922e08f3746 (diff)
Remove functions which return strings
We don't want anything which does dynamic memory allocation in the library.
-rw-r--r--include/olm/crypto.hh2
-rw-r--r--include/olm/memory.hh19
-rw-r--r--src/crypto.cpp5
3 files changed, 0 insertions, 26 deletions
diff --git a/include/olm/crypto.hh b/include/olm/crypto.hh
index 159bac7..7a05f8d 100644
--- a/include/olm/crypto.hh
+++ b/include/olm/crypto.hh
@@ -17,7 +17,6 @@
#include <cstdint>
#include <cstddef>
-#include <string>
namespace olm {
@@ -27,7 +26,6 @@ static const std::size_t IV_LENGTH = 16;
struct Curve25519PublicKey {
std::uint8_t public_key[KEY_LENGTH];
- std::string to_string() const;
};
diff --git a/include/olm/memory.hh b/include/olm/memory.hh
index 89afd99..74ff9f8 100644
--- a/include/olm/memory.hh
+++ b/include/olm/memory.hh
@@ -87,23 +87,4 @@ std::uint8_t * store_array(
return destination + sizeof(T);
}
-/** convert an array of bytes to a string representation */
-template<typename T>
-std::string bytes_to_string(T start, T end) {
- std::ostringstream ss;
- ss << std::hex << std::setfill('0');
- while (start != end) {
- ss << std::setw(2) << static_cast<int>(*start++);
- if (start != end) {
- ss << ":";
- }
- }
- return ss.str();
-}
-
-template<typename T>
-std::string bytes_to_string(T start, size_t len) {
- return bytes_to_string(start, start+len);
-}
-
} // namespace olm
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 3801e93..da1d617 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -101,11 +101,6 @@ inline static void hmac_sha256_final(
} // namespace
-std::string olm::Curve25519PublicKey::to_string() const {
- return olm::bytes_to_string(std::begin(public_key),
- std::end(public_key));
-};
-
void olm::curve25519_generate_key(
std::uint8_t const * random_32_bytes,
olm::Curve25519KeyPair & key_pair