X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Fcfg.go;h=3400ed83a93e7d850f85da7b47653497592e14a9;hb=97b386a58ef33cac2ba39ac2e273bc632eb026ad;hp=9419886071a5ac657729825ef3f428cfb1f1a9aa;hpb=07550b82c27aed5186aea04b2a0f7d36dfaeb0c3;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go
index 9419886..3400ed8 100644
--- a/src/cypherpunks.ru/nncp/cfg.go
+++ b/src/cypherpunks.ru/nncp/cfg.go
@@ -19,12 +19,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package nncp
 
 import (
+	"bytes"
 	"errors"
+	"log"
 	"os"
 	"path"
 
 	"github.com/gorhill/cronexpr"
 	"golang.org/x/crypto/ed25519"
+	"golang.org/x/crypto/ssh/terminal"
 	"gopkg.in/yaml.v2"
 )
 
@@ -334,9 +337,21 @@ func (nodeOur *NodeOur) ToYAML() string {
 }
 
 func CfgParse(data []byte) (*Ctx, error) {
+	var err error
+	if bytes.Compare(data[:8], MagicNNCPBv1[:]) == 0 {
+		os.Stderr.WriteString("Passphrase:")
+		password, err := terminal.ReadPassword(0)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		os.Stderr.WriteString("\n")
+		data, err = DeEBlob(data, password)
+		if err != nil {
+			return nil, err
+		}
+	}
 	var cfgYAML CfgYAML
-	err := yaml.Unmarshal(data, &cfgYAML)
-	if err != nil {
+	if err = yaml.Unmarshal(data, &cfgYAML); err != nil {
 		return nil, err
 	}
 	if _, exists := cfgYAML.Neigh["self"]; !exists {