X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Feblob.go;h=a65f06842e16386a91ca84e7ec3d4cfc9bb41b79;hb=be389bd7f3d36d371007c86341059b042233d455;hp=64327901bd1f4455bf2deac59d65322bcbce2e66;hpb=c8b26fe06596d26bdb14c5be85760fb3ddb197b3;p=nncp.git

diff --git a/src/eblob.go b/src/eblob.go
index 6432790..a65f068 100644
--- a/src/eblob.go
+++ b/src/eblob.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ import (
 	"crypto/rand"
 	"hash"
 
-	"github.com/davecgh/go-xdr/xdr2"
+	xdr "github.com/davecgh/go-xdr/xdr2"
 	"go.cypherpunks.ru/balloon"
 	"golang.org/x/crypto/blake2b"
 	"golang.org/x/crypto/chacha20poly1305"
@@ -34,10 +34,6 @@ const (
 	DefaultP = 2
 )
 
-var (
-	MagicNNCPBv3 [8]byte = [8]byte{'N', 'N', 'C', 'P', 'B', 0, 0, 3}
-)
-
 type EBlob struct {
 	Magic [8]byte
 	SCost uint32
@@ -65,7 +61,7 @@ func NewEBlob(sCost, tCost, pCost int, password, data []byte) ([]byte, error) {
 		return nil, err
 	}
 	eblob := EBlob{
-		Magic: MagicNNCPBv3,
+		Magic: MagicNNCPBv3.B,
 		SCost: uint32(sCost),
 		TCost: uint32(tCost),
 		PCost: uint32(pCost),
@@ -97,8 +93,17 @@ func DeEBlob(eblobRaw, password []byte) ([]byte, error) {
 	if _, err = xdr.Unmarshal(bytes.NewReader(eblobRaw), &eblob); err != nil {
 		return nil, err
 	}
-	if eblob.Magic != MagicNNCPBv3 {
-		return nil, BadMagic
+	switch eblob.Magic {
+	case MagicNNCPBv1.B:
+		err = MagicNNCPBv1.TooOld()
+	case MagicNNCPBv2.B:
+		err = MagicNNCPBv1.TooOld()
+	case MagicNNCPBv3.B:
+	default:
+		err = BadMagic
+	}
+	if err != nil {
+		return nil, err
 	}
 	key := balloon.H(
 		blake256,