From 8b4b86b3ee5a6adb3b051d3624cb53e1ee5d327d Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Sat, 9 Feb 2019 19:50:47 -0500
Subject: [PATCH] log even more, force key regeneration when save is not
 selected

---
 README.md.asc               | 16 ++++++++--------
 forwarder-client.go         |  2 +-
 forwarder.go                |  2 +-
 i2pkeys/common.go           |  5 ++++-
 i2pkeys/common_test.go      |  4 ++--
 udp/forwarder-client-udp.go |  2 +-
 udp/forwarder-udp.go        |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/README.md.asc b/README.md.asc
index 92b2cdb..274a3a0 100644
--- a/README.md.asc
+++ b/README.md.asc
@@ -131,12 +131,12 @@ Donate
   BTC:159M8MEUwhTzE9RXmcZxtigKaEjgfwRbHt
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCgAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlxfYwMACgkQ11wDs5te
-FOGGBAf+KZ0HykyBh7xajpRfUTxvP/2vUtVipvZ40OQNEd/3JHebke4stCqllFO+
-7xRqGWJPzEj439hfHaS268NAiEWRLoi0gNLEhmWkc/OfmaIxyKo0UD3Yp1CirvES
-oLAYguijKjFRiIVfnHCLb+tWvTZM51WZ0Jza+aRQkb0yUN5JK6ORsYhqE7wjyJMi
-sN/w+9o03C9pe90LjwiFKQ7TOXDqbWARsFctfRuoqHJLn5MaGfsGqwB4k6cV4oG7
-PongF7M1uS9zNiNEVKo6+vvGIhQMNNVcwWJjvA35rROs0t01VcXfHROJzZ5jQTI2
-NmoREqEn6mBLPueXuL80GROnRxgs5g==
-=fPec
+iQEzBAEBCgAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlxfdWIACgkQ11wDs5te
+FOH2Hwf+L63UsgKujukILs6/vPFe5rTvqVpM1NXko+49KcI8M0toiOS3Fqq66n4R
+o3iy7bKR9W0wlkbvXrhCAI6QHT4C4Rv3lneN18+Lw3L5l7AzbSqa/+nHGj7IoVg3
+5U8IH0HRv3LvAA4PJhmYmKCU/zO0Cblc8n1hFtVlT6Xby4NUNypqVRh9SK9NFg+i
+AcenunoBMD6ggYR0nEZ9gKRW2LNY7+0kGc4oCwckQ5I9j1PIbhpwsQjVunLEUmd+
+x1fFd4gzt4mnih06XkyVNbggMZQmgJ+BRv5kBMBlpfzrSsaFcolRRrvNeua2uLWm
+3RZgd29GUvDU7OPALdbUcy0+a0Q6+g==
+=0nQN
 -----END PGP SIGNATURE-----
diff --git a/forwarder-client.go b/forwarder-client.go
index 80c783f..a0e48df 100644
--- a/forwarder-client.go
+++ b/forwarder-client.go
@@ -295,7 +295,7 @@ func NewSAMClientForwarderFromOptions(opts ...func(*SAMClientForwarder) error) (
 	if s.save {
 		log.Println("Saving i2p keys")
 	}
-	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil {
+	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
 		return nil, err
 	}
 	log.Println("Destination keys generated, tunnel name:", s.TunName)
diff --git a/forwarder.go b/forwarder.go
index e75cc2c..2b33a93 100644
--- a/forwarder.go
+++ b/forwarder.go
@@ -400,7 +400,7 @@ func NewSAMForwarderFromOptions(opts ...func(*SAMForwarder) error) (*SAMForwarde
 	if s.save {
 		log.Println("Saving i2p keys")
 	}
-	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil {
+	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
 		return nil, err
 	}
 	log.Println("Destination keys generated, tunnel name:", s.TunName)
diff --git a/i2pkeys/common.go b/i2pkeys/common.go
index 7f686db..cda4344 100644
--- a/i2pkeys/common.go
+++ b/i2pkeys/common.go
@@ -54,7 +54,10 @@ func Save(FilePath, TunName, passfile string, SamKeys sam3.I2PKeys) error {
 	return nil
 }
 
-func Load(FilePath, TunName, passfile string, samConn *sam3.SAM) (sam3.I2PKeys, error) {
+func Load(FilePath, TunName, passfile string, samConn *sam3.SAM, save bool) (sam3.I2PKeys, error) {
+    if ! save {
+        return samConn.NewKeys()
+    }
 	if _, err := os.Stat(filepath.Join(FilePath, TunName+".i2pkeys")); os.IsNotExist(err) {
 		log.Println("Generating keys from SAM bridge")
 		SamKeys, err := samConn.NewKeys()
diff --git a/i2pkeys/common_test.go b/i2pkeys/common_test.go
index 76e1262..ec1e9c6 100644
--- a/i2pkeys/common_test.go
+++ b/i2pkeys/common_test.go
@@ -15,7 +15,7 @@ func TestKeysGenLoad(t *testing.T) {
 		t.Fatal(err)
 	}
 	log.Println("Initialized SAM connection")
-	sk, err := Load("./", "test", "", sc)
+	sk, err := Load("./", "test", "", sc, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -32,7 +32,7 @@ func TestKeysGenLoadAgain(t *testing.T) {
 		t.Fatal(err)
 	}
 	log.Println("Saved tunnel keys")
-	sk, err := Load("./", "test", "", sc)
+	sk, err := Load("./", "test", "", sc, true)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/udp/forwarder-client-udp.go b/udp/forwarder-client-udp.go
index e68e30d..8c560ac 100644
--- a/udp/forwarder-client-udp.go
+++ b/udp/forwarder-client-udp.go
@@ -296,7 +296,7 @@ func NewSAMSSUClientForwarderFromOptions(opts ...func(*SAMSSUClientForwarder) er
 	if s.save {
 		log.Println("Saving i2p keys")
 	}
-	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil {
+	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
 		return nil, err
 	}
 	log.Println("Destination keys generated, tunnel name:", s.TunName)
diff --git a/udp/forwarder-udp.go b/udp/forwarder-udp.go
index 2301061..f9a0ccc 100644
--- a/udp/forwarder-udp.go
+++ b/udp/forwarder-udp.go
@@ -292,7 +292,7 @@ func NewSAMSSUForwarderFromOptions(opts ...func(*SAMSSUForwarder) error) (*SAMSS
 	if s.save {
 		log.Println("Saving i2p keys")
 	}
-	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil {
+	if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
 		return nil, err
 	}
 	log.Println("Destination keys generated, tunnel name:", s.TunName)