From 958b406e0e650db50a16ee5c80e7b6bd011a9808 Mon Sep 17 00:00:00 2001
From: Dmitry Chestnykh <dmitry@codingrobots.com>
Date: Mon, 6 Jun 2011 14:34:01 +0200
Subject: [PATCH] Avoid modulo bias.

---
 uniuri.go | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/uniuri.go b/uniuri.go
index a4d6bbd..7b6155f 100644
--- a/uniuri.go
+++ b/uniuri.go
@@ -45,12 +45,25 @@ func NewLen(length int) string {
 // of the provided byte slice of allowed characters (maximum 256).
 func NewLenChars(length int, chars []byte) string {
 	b := make([]byte, length)
-	if _, err := io.ReadFull(rand.Reader, b); err != nil {
-		panic("error reading from random source: " + err.String())
+	r := make([]byte, length+(length/4)) // storage for random bytes.
+	clen := byte(len(chars))
+	maxrb := byte(256 - (256 % len(chars)))
+	i := 0
+	for {
+		if _, err := io.ReadFull(rand.Reader, r); err != nil {
+			panic("error reading from random source: " + err.String())
+		}
+		for _, c := range r {
+			if c >= maxrb {
+				// Skip this number to avoid modulo bias.
+				continue
+			}
+			b[i] = chars[c%clen]
+			i++
+			if i == length {
+				return string(b)
+			}
+		}
 	}
-	alen := byte(len(chars))
-	for i, c := range b {
-		b[i] = chars[c%alen]
-	}
-	return string(b)
+	panic("unreachable")
 }