Fixed ICE-5598 (generateRandom) and ICE-5520 (removed openssl/patch.mingw)

1 files changed, 5 insertions, 4 deletions

diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index eed9061fce7..07b7a806868 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/Client.cpp
@@ -109,13 +109,14 @@ struct GenerateRandomString
     operator()()
     {
         string s;
-        s.resize(20);
-        char buf[20];
-        IceUtilInternal::generateRandom(buf, static_cast<int>(sizeof(buf)));
+        s.resize(21);
+        char buf[21];
+        IceUtilInternal::generateRandom(buf, sizeof(buf));
         for(unsigned int i = 0; i < sizeof(buf); ++i)
         {
-            s[i] = 33 + buf[i] % (127-33); // We use ASCII 33-126 (from ! to ~, w/o space).
+            s[i] = 33 + static_cast<unsigned char>(buf[i]) % (127 - 33); // We use ASCII 33-126 (from ! to ~, w/o space).
         }
+        // cerr << s << endl;
         return s;
     }
 };