perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually generate random certificate serials (fixes #361)

Browse Source
This commit is contained in:
Jakob Borg 2014-06-13 01:49:30 +02:00
parent 46e963443d
commit 2ffdb5a82a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/gui.go
View File

@ -59,7 +59,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
cert, err := loadCert(confDir, "https-") cert, err := loadCert(confDir, "https-")
if err != nil { if err != nil {
l.Infoln("Loading HTTPS certificate:", err) l.Infoln("Loading HTTPS certificate:", err)
l.Infoln("Creating new HTTPS certificate", err) l.Infoln("Creating new HTTPS certificate")
newCertificate(confDir, "https-") newCertificate(confDir, "https-")
cert, err = loadCert(confDir, "https-") cert, err = loadCert(confDir, "https-")
} }

11
cmd/syncthing/main.go
View File

@ -107,6 +107,10 @@ The following enviroment variables are interpreted by syncthing:
STGUIASSETS Directory to load GUI assets from. Overrides compiled in assets.` STGUIASSETS Directory to load GUI assets from. Overrides compiled in assets.`
) )
func init() {
rand.Seed(time.Now().UnixNano())
}
func main() { func main() {
var reset bool var reset bool
var showVersion bool var showVersion bool
@ -354,8 +358,7 @@ func main() {
if cfg.Options.UPnPEnabled { if cfg.Options.UPnPEnabled {
// We seed the random number generator with the node ID to get a // We seed the random number generator with the node ID to get a
// repeatable sequence of random external ports. // repeatable sequence of random external ports.
rand.Seed(certSeed(cert.Certificate[0])) externalPort = setupUPnP(rand.NewSource(certSeed(cert.Certificate[0])))
externalPort = setupUPnP()
} }
// Routine to connect out to configured nodes // Routine to connect out to configured nodes
@ -426,7 +429,7 @@ func waitForParentExit() {
l.Okln("Continuing") l.Okln("Continuing")
} }
func setupUPnP() int { func setupUPnP(r rand.Source) int {
var externalPort = 0 var externalPort = 0
if len(cfg.Options.ListenAddress) == 1 { if len(cfg.Options.ListenAddress) == 1 {
_, portStr, err := net.SplitHostPort(cfg.Options.ListenAddress[0]) _, portStr, err := net.SplitHostPort(cfg.Options.ListenAddress[0])
@ -438,7 +441,7 @@ func setupUPnP() int {
igd, err := upnp.Discover() igd, err := upnp.Discover()
if err == nil { if err == nil {
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
r := 1024 + rand.Intn(65535-1024) r := 1024 + int(r.Int63()%(65535-1024))
err := igd.AddPortMapping(upnp.TCP, r, port, "syncthing", 0) err := igd.AddPortMapping(upnp.TCP, r, port, "syncthing", 0)
if err == nil { if err == nil {
externalPort = r externalPort = r