mirrors/age
1
0
Fork 0
mirror of https://github.com/FiloSottile/age.git synced 2026-01-06 20:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/armor: new package

Browse Source
This commit is contained in:
Filippo Valsorda
2020-05-17 23:50:13 -04:00
parent a7c4274d23
commit c7c7f1870f
4 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/age/age.go
View File

@@ -17,7 +17,7 @@ import (
"strings"
"filippo.io/age/internal/age"
"filippo.io/age/internal/format"
"filippo.io/age/internal/armor"
"golang.org/x/crypto/ssh/terminal"
)
@@ -207,10 +207,10 @@ func encryptPass(pass string, in io.Reader, out io.Writer, armor bool) {
encrypt([]age.Recipient{r}, in, out, armor)
}
func encrypt(recipients []age.Recipient, in io.Reader, out io.Writer, armor bool) {
func encrypt(recipients []age.Recipient, in io.Reader, out io.Writer, withArmor bool) {
ageEncrypt := age.Encrypt
if armor {
a := format.ArmoredWriter(out)
if withArmor {
a := armor.NewWriter(out)
defer func() {
if err := a.Close(); err != nil {
logFatalf("Error: %v", err)
@@ -248,9 +248,8 @@ func decrypt(keys []string, in io.Reader, out io.Writer) {
}
rr := bufio.NewReader(in)
armorHeader := "-----BEGIN AGE ENCRYPTED FILE-----"
if start, _ := rr.Peek(len(armorHeader)); string(start) == armorHeader {
in = format.ArmoredReader(rr)
if start, _ := rr.Peek(len(armor.Header)); string(start) == armor.Header {
in = armor.NewReader(rr)
} else {
in = rr
}