From 5ff5a32df70c001caf930a3cdfabea3f8bf0c24d Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Fri, 12 Jun 2020 18:41:42 +0200
Subject: [PATCH] Proper naming for RsRandom string functions

---
 libretroshare/src/util/rsrandom.cc | 25 +++++++++++++++++++------
 libretroshare/src/util/rsrandom.h  | 12 +++++++++++-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/libretroshare/src/util/rsrandom.cc b/libretroshare/src/util/rsrandom.cc
index 7ea8eb968..dc7d9ac67 100644
--- a/libretroshare/src/util/rsrandom.cc
+++ b/libretroshare/src/util/rsrandom.cc
@@ -121,13 +121,26 @@ double RsRandom::random_f64()
 	return random_u64() / (double)(~(uint64_t)0) ;
 }
 
-std::string RsRandom::random_alphaNumericString(uint32_t len)
+/*static*/ std::string RsRandom::alphaNumeric(uint32_t length)
 {
-	std::string s = "" ;
+	std::string s;
+	while(s.size() < length)
+	{
+		uint8_t rChar; random_bytes(&rChar, 1); rChar = rChar % 123;
+		/* if(isalnum(val)) isalnum result may vary depend on locale!! */
+		if( (rChar >= 48 && rChar <= 57)  /* 0-9 */ ||
+		    (rChar >= 65 && rChar <= 90)  /* A-Z */ ||
+		    (rChar >= 97 && rChar <= 122) /* a-z */ )
+			s += static_cast<char>(rChar);
+	}
 
-	for(uint32_t i=0;i<len;++i)
-		s += (char)( (random_u32()%94) + 33) ;
-
-	return s ;
+	return s;
 }
 
+/*static*/ std::string RsRandom::printable(uint32_t length)
+{
+	std::string ret(length, 0);
+	random_bytes(reinterpret_cast<uint8_t*>(&ret[0]), length);
+	for(uint32_t i=0; i<length; ++i) ret[i] = (ret[i] % 94) + 33;
+	return ret;
+}
diff --git a/libretroshare/src/util/rsrandom.h b/libretroshare/src/util/rsrandom.h
index aeebfa56c..5e7e0d92c 100644
--- a/libretroshare/src/util/rsrandom.h
+++ b/libretroshare/src/util/rsrandom.h
@@ -46,9 +46,19 @@ public:
 
 	static bool     seed(uint32_t s);
 
-	static std::string random_alphaNumericString(uint32_t length);
 	static void        random_bytes(uint8_t* data, uint32_t length);
 
+	/** Return a random alphanumeric string of the given lenght */
+	static std::string alphaNumeric(uint32_t length);
+
+	/** Return a random printable string of the given lenght */
+	static std::string printable(uint32_t length);
+
+	/** This return a printable string not an alphanumeric one @deprecated */
+	RS_DEPRECATED_FOR("RsRandom::printable")
+	static inline std::string random_alphaNumericString(uint32_t length)
+	{ return printable(length); }
+
 private:
 	static RsMutex rndMtx;