Another goSam version update

vendor/github.com/eyedeekay/sam3/i2pkeys/I2PAddr.go

@@ -7,6 +7,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"io"
+	"os"
 	"strings"
 )
 
@@ -31,6 +32,18 @@ func NewKeys(addr I2PAddr, both string) I2PKeys {
 	return I2PKeys{addr, both}
 }
 
+// fileExists checks if a file exists and is not a directory before we
+// try using it to prevent further errors.
+func fileExists(filename string) (bool, error) {
+	info, err := os.Stat(filename)
+	if os.IsNotExist(err) {
+		return false, nil
+	} else if err != nil {
+		return false, err
+	}
+	return !info.IsDir(), nil
+}
+
 // load keys from non standard format
 func LoadKeysIncompat(r io.Reader) (k I2PKeys, err error) {
 	var buff bytes.Buffer
@@ -42,12 +55,40 @@ func LoadKeysIncompat(r io.Reader) (k I2PKeys, err error) {
 	return
 }
 
+// load keys from non-standard format by specifying a text file.
+// If the file does not exist, generate keys, otherwise, fail
+// closed.
+func LoadKeys(r string) (I2PKeys, error) {
+	exists, err := fileExists(r)
+	if err != nil {
+		return I2PKeys{}, err
+	}
+	if exists {
+		fi, err := os.Open(r)
+		if err != nil {
+			return I2PKeys{}, err
+		}
+		defer fi.Close()
+		return LoadKeysIncompat(fi)
+	}
+	return I2PKeys{}, err
+}
+
 // store keys in non standard format
 func StoreKeysIncompat(k I2PKeys, w io.Writer) (err error) {
 	_, err = io.WriteString(w, k.Address.Base64()+"\n"+k.Both)
 	return
 }
 
+func StoreKeys(k I2PKeys, r string) error {
+	fi, err := os.Open(r)
+	if err != nil {
+		return err
+	}
+	defer fi.Close()
+	return StoreKeysIncompat(k, fi)
+}
+
 // Returns the public keys of the I2PKeys.
 func (k I2PKeys) Addr() I2PAddr {
 	return k.Address
@@ -160,11 +201,7 @@ func NewI2PAddrFromBytes(addr []byte) (I2PAddr, error) {
 
 // Turns an I2P address to a byte array. The inverse of NewI2PAddrFromBytes().
 func (addr I2PAddr) ToBytes() ([]byte, error) {
-	buf := make([]byte, i2pB64enc.DecodedLen(len(addr)))
-	if _, err := i2pB64enc.Decode(buf, []byte(addr)); err != nil {
-		return buf, errors.New("Address is not base64-encoded")
-	}
-	return buf, nil
+	return i2pB64enc.DecodeString(string(addr))
 }
 
 func (addr I2PAddr) Bytes() []byte {