Restore nonce state before temporary file decryption

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 3e0fe647013658522db411a4843546b819ac97f7..967f8681781abefa105464874fb3df837fd300fb 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -5,6 +5,10 @@
 @subsection Релиз 7.1.0
 @itemize
 
+@item
+Исправлена работоспособность @command{nncp-file} и @command{nncp-exec}
+команд использующих временный файл (stdin и @option{-use-tmp}).
+
 @item
 Исправлено некорректное генерирование @file{.hdr} при использовании
 транзитных пакетов.

diff --git a/doc/news.texi b/doc/news.texi
index cfa36c4ddc42c97d6b58f9ffd3764796a8adf469..160fd39fee086c485619bd7a078d04729bfc12b9 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -7,6 +7,10 @@ See also this page @ref{Новости, on russian}.
 @section Release 7.1.0
 @itemize
 
+@item
+Fixed workability of @command{nncp-file} and @command{nncp-exec}
+commands, that use temporary file (stdin and @option{-use-tmp}).
+
 @item
 Fixed invalid @file{.hdr} generation when transitional packets are used.
 

diff --git a/src/tx.go b/src/tx.go
index a90a49e42d05f0f96e3639e3740099f15a40c29c..681f9786038ec6fc8ed38960c6bbd3caab18d687 100644 (file)
--- a/src/tx.go
+++ b/src/tx.go
@@ -316,6 +316,9 @@ func throughTmpFile(r io.Reader) (
        }
        r, w := io.Pipe()
        go func() {
+               for i := 0; i < aead.NonceSize(); i++ {
+                       nonce[i] = 0
+               }
                if _, err := aeadProcess(aead, nonce, nil, false, bufio.NewReader(src), w); err != nil {
                        w.CloseWithError(err) // #nosec G104
                }