commit 8eef3b63482deb50d988e3703b7a718802cdd2f1
Author: David Fifield <da...@bamsoftware.com>
Date: Thu Apr 2 13:51:06 2020 -0600
Remove uniuri dependency.
https://bugs.torproject.org/33800
---
client/lib/webrtc.go | 11 +++++++++--
go.mod | 1 -
go.sum | 2 --
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go
index 0b3bb16..5aa7aec 100644
--- a/client/lib/webrtc.go
+++ b/client/lib/webrtc.go
@@ -2,13 +2,14 @@ package lib
import (
"bytes"
+ "crypto/rand"
+ "encoding/hex"
"errors"
"io"
"log"
"sync"
"time"
- "github.com/dchest/uniuri"
"github.com/pion/webrtc/v2"
)
@@ -46,7 +47,13 @@ type WebRTCPeer struct {
func NewWebRTCPeer(config *webrtc.Configuration,
broker *BrokerChannel) *WebRTCPeer {
connection := new(WebRTCPeer)
- connection.id = "snowflake-" + uniuri.New()
+ {
+ var buf [8]byte
+ if _, err := rand.Read(buf[:]); err != nil {
+ panic(err)
+ }
+ connection.id = "snowflake-" + hex.EncodeToString(buf[:])
+ }
connection.config = config
connection.broker = broker
connection.offerChannel = make(chan *webrtc.SessionDescription, 1)
diff --git a/go.mod b/go.mod
index b203976..4366d6a 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.13
require (
git.torproject.org/pluggable-transports/goptlib.git v1.1.0
- github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5
github.com/golang/protobuf v1.3.1 // indirect
github.com/gorilla/websocket v1.4.1
github.com/pion/sdp/v2 v2.3.4
diff --git a/go.sum b/go.sum
index af45818..3708fc0 100644
--- a/go.sum
+++ b/go.sum
@@ -5,8 +5,6 @@ github.com/cheekybits/genny v1.0.0/go.mod
h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wX
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5
h1:RAV05c0xOkJ3dZGS0JFybxFKZ2WMLabgx3uXnd7rpGs=
-github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod
h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
github.com/fsnotify/fsnotify v1.4.7
h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod
h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
