Merge fixups. Add locking to default session manager. Use chrono lib

and unique_ptr.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/kdf/prf_tls/prf_tls.cpp b/src/kdf/prf_tls/prf_tls.cpp
index 3790650b0..1236e13c7 100644
--- a/src/kdf/prf_tls/prf_tls.cpp
+++ b/src/kdf/prf_tls/prf_tls.cpp
@@ -29,7 +29,8 @@ void P_hash(MemoryRegion<byte>& output,
       }
    catch(Invalid_Key_Length)
       {
-      throw Internal_Error("The premaster secret of " + to_string(secret_len) +
+      throw Internal_Error("The premaster secret of " +
+                           std::to_string(secret_len) +
                            " bytes is too long for the PRF");
       }