From 189041b668629795593766bcb8d3f70ee248b842 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 27 Jun 2020 22:06:32 -0400 Subject: [PATCH] =?UTF-8?q?age:=20move=20package=20from=20filippo.io/age/a?= =?UTF-8?q?ge=20to=20filippo.io/age=20=F0=9F=A4=A6=E2=80=8D=E2=99=82?= =?UTF-8?q?=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- age/age.go => age.go | 2 +- age/age_test.go => age_test.go | 2 +- agessh/agessh.go | 2 +- agessh/encrypted_keys.go | 2 +- armor/armor_test.go | 2 +- cmd/age-keygen/keygen.go | 2 +- cmd/age/age.go | 2 +- cmd/age/age_test.go | 2 +- cmd/age/encrypted_keys.go | 2 +- cmd/age/parse.go | 2 +- age/primitives.go => primitives.go | 0 age/recipients_test.go => recipients_test.go | 2 +- age/scrypt.go => scrypt.go | 0 age/x25519.go => x25519.go | 0 14 files changed, 11 insertions(+), 11 deletions(-) rename age/age.go => age.go (99%) rename age/age_test.go => age_test.go (99%) rename age/primitives.go => primitives.go (100%) rename age/recipients_test.go => recipients_test.go (98%) rename age/scrypt.go => scrypt.go (100%) rename age/x25519.go => x25519.go (100%) diff --git a/age/age.go b/age.go similarity index 99% rename from age/age.go rename to age.go index b78b4c5d..024aeb14 100644 --- a/age/age.go +++ b/age.go @@ -10,7 +10,7 @@ // For most use cases, use the Encrypt and Decrypt functions with // X25519Recipient and X25519Identity. If passphrase encryption is required, use // ScryptRecipient and ScryptIdentity. For compatibility with existing SSH keys -// use the filippo.io/age/agessh package. +// use the filippo.io/agessh package. // // Age encrypted files are binary and not malleable, for encoding them as text, // use the filippo.io/age/armor package. diff --git a/age/age_test.go b/age_test.go similarity index 99% rename from age/age_test.go rename to age_test.go index cae9cf25..43e9c8be 100644 --- a/age/age_test.go +++ b/age_test.go @@ -15,7 +15,7 @@ import ( "log" "testing" - "filippo.io/age/age" + "filippo.io/age" ) func ExampleEncrypt() { diff --git a/agessh/agessh.go b/agessh/agessh.go index f1ec0fb7..281f3005 100644 --- a/agessh/agessh.go +++ b/agessh/agessh.go @@ -23,7 +23,7 @@ import ( "io" "math/big" - "filippo.io/age/age" + "filippo.io/age" "filippo.io/age/internal/format" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/curve25519" diff --git a/agessh/encrypted_keys.go b/agessh/encrypted_keys.go index 37ff381c..2e4f7341 100644 --- a/agessh/encrypted_keys.go +++ b/agessh/encrypted_keys.go @@ -11,7 +11,7 @@ import ( "crypto/rsa" "fmt" - "filippo.io/age/age" + "filippo.io/age" "golang.org/x/crypto/ssh" ) diff --git a/armor/armor_test.go b/armor/armor_test.go index 4620b4ee..5ffff190 100644 --- a/armor/armor_test.go +++ b/armor/armor_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "filippo.io/age/age" + "filippo.io/age" "filippo.io/age/armor" ) diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go index 2c39b637..d358de60 100644 --- a/cmd/age-keygen/keygen.go +++ b/cmd/age-keygen/keygen.go @@ -13,7 +13,7 @@ import ( "os" "time" - "filippo.io/age/age" + "filippo.io/age" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/age/age.go b/cmd/age/age.go index 0ddf3996..12679b4b 100644 --- a/cmd/age/age.go +++ b/cmd/age/age.go @@ -16,7 +16,7 @@ import ( "os" "strings" - "filippo.io/age/age" + "filippo.io/age" "filippo.io/age/armor" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go index 5a62dd1d..5a0b9644 100644 --- a/cmd/age/age_test.go +++ b/cmd/age/age_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "filippo.io/age/age" + "filippo.io/age" ) func TestVectors(t *testing.T) { diff --git a/cmd/age/encrypted_keys.go b/cmd/age/encrypted_keys.go index 4ee71ded..6783170f 100644 --- a/cmd/age/encrypted_keys.go +++ b/cmd/age/encrypted_keys.go @@ -10,7 +10,7 @@ import ( "fmt" "os" - "filippo.io/age/age" + "filippo.io/age" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/age/parse.go b/cmd/age/parse.go index 17f7e7c1..72e3ec48 100644 --- a/cmd/age/parse.go +++ b/cmd/age/parse.go @@ -15,7 +15,7 @@ import ( "os" "strings" - "filippo.io/age/age" + "filippo.io/age" "filippo.io/age/agessh" "golang.org/x/crypto/ssh" ) diff --git a/age/primitives.go b/primitives.go similarity index 100% rename from age/primitives.go rename to primitives.go diff --git a/age/recipients_test.go b/recipients_test.go similarity index 98% rename from age/recipients_test.go rename to recipients_test.go index 138ed77f..1b9436b5 100644 --- a/age/recipients_test.go +++ b/recipients_test.go @@ -11,7 +11,7 @@ import ( "crypto/rand" "testing" - "filippo.io/age/age" + "filippo.io/age" "filippo.io/age/internal/format" ) diff --git a/age/scrypt.go b/scrypt.go similarity index 100% rename from age/scrypt.go rename to scrypt.go diff --git a/age/x25519.go b/x25519.go similarity index 100% rename from age/x25519.go rename to x25519.go