From e6093596512e41413220e2db373095defaf89cb1 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 27 Jun 2020 21:08:42 -0400 Subject: [PATCH] =?UTF-8?q?age,agessh,armor:=20unleash=20public=20API=20?= =?UTF-8?q?=F0=9F=92=A5=F0=9F=A6=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {internal/age => age}/age.go | 4 ++-- {internal/age => age}/age_test.go | 2 +- {internal/age => age}/primitives.go | 0 {internal/age => age}/recipients_test.go | 2 +- {internal/age => age}/scrypt.go | 0 {internal/age => age}/x25519.go | 0 {internal/agessh => agessh}/agessh.go | 2 +- {internal/agessh => agessh}/agessh_test.go | 2 +- {internal/agessh => agessh}/encrypted_keys.go | 2 +- {internal/armor => armor}/armor.go | 0 {internal/armor => armor}/armor_test.go | 4 ++-- cmd/age-keygen/keygen.go | 2 +- cmd/age/age.go | 4 ++-- cmd/age/age_test.go | 2 +- cmd/age/encrypted_keys.go | 2 +- cmd/age/parse.go | 4 ++-- 16 files changed, 16 insertions(+), 16 deletions(-) rename {internal/age => age}/age.go (98%) rename {internal/age => age}/age_test.go (99%) rename {internal/age => age}/primitives.go (100%) rename {internal/age => age}/recipients_test.go (98%) rename {internal/age => age}/scrypt.go (100%) rename {internal/age => age}/x25519.go (100%) rename {internal/agessh => agessh}/agessh.go (99%) rename {internal/agessh => agessh}/agessh_test.go (98%) rename {internal/agessh => agessh}/encrypted_keys.go (99%) rename {internal/armor => armor}/armor.go (100%) rename {internal/armor => armor}/armor_test.go (97%) diff --git a/internal/age/age.go b/age/age.go similarity index 98% rename from internal/age/age.go rename to age/age.go index 1413375..b78b4c5 100644 --- a/internal/age/age.go +++ b/age/age.go @@ -10,10 +10,10 @@ // 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/internal/agessh package. +// use the filippo.io/age/agessh package. // // Age encrypted files are binary and not malleable, for encoding them as text, -// use the filippo.io/age/internal/armor package. +// use the filippo.io/age/armor package. package age import ( diff --git a/internal/age/age_test.go b/age/age_test.go similarity index 99% rename from internal/age/age_test.go rename to age/age_test.go index 7775f26..cae9cf2 100644 --- a/internal/age/age_test.go +++ b/age/age_test.go @@ -15,7 +15,7 @@ import ( "log" "testing" - "filippo.io/age/internal/age" + "filippo.io/age/age" ) func ExampleEncrypt() { diff --git a/internal/age/primitives.go b/age/primitives.go similarity index 100% rename from internal/age/primitives.go rename to age/primitives.go diff --git a/internal/age/recipients_test.go b/age/recipients_test.go similarity index 98% rename from internal/age/recipients_test.go rename to age/recipients_test.go index fd80b94..138ed77 100644 --- a/internal/age/recipients_test.go +++ b/age/recipients_test.go @@ -11,7 +11,7 @@ import ( "crypto/rand" "testing" - "filippo.io/age/internal/age" + "filippo.io/age/age" "filippo.io/age/internal/format" ) diff --git a/internal/age/scrypt.go b/age/scrypt.go similarity index 100% rename from internal/age/scrypt.go rename to age/scrypt.go diff --git a/internal/age/x25519.go b/age/x25519.go similarity index 100% rename from internal/age/x25519.go rename to age/x25519.go diff --git a/internal/agessh/agessh.go b/agessh/agessh.go similarity index 99% rename from internal/agessh/agessh.go rename to agessh/agessh.go index 9950c89..f1ec0fb 100644 --- a/internal/agessh/agessh.go +++ b/agessh/agessh.go @@ -23,7 +23,7 @@ import ( "io" "math/big" - "filippo.io/age/internal/age" + "filippo.io/age/age" "filippo.io/age/internal/format" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/curve25519" diff --git a/internal/agessh/agessh_test.go b/agessh/agessh_test.go similarity index 98% rename from internal/agessh/agessh_test.go rename to agessh/agessh_test.go index d800d0e..97358c3 100644 --- a/internal/agessh/agessh_test.go +++ b/agessh/agessh_test.go @@ -13,7 +13,7 @@ import ( "crypto/rsa" "testing" - "filippo.io/age/internal/agessh" + "filippo.io/age/agessh" "filippo.io/age/internal/format" "golang.org/x/crypto/ssh" ) diff --git a/internal/agessh/encrypted_keys.go b/agessh/encrypted_keys.go similarity index 99% rename from internal/agessh/encrypted_keys.go rename to agessh/encrypted_keys.go index 68c07a9..37ff381 100644 --- a/internal/agessh/encrypted_keys.go +++ b/agessh/encrypted_keys.go @@ -11,7 +11,7 @@ import ( "crypto/rsa" "fmt" - "filippo.io/age/internal/age" + "filippo.io/age/age" "golang.org/x/crypto/ssh" ) diff --git a/internal/armor/armor.go b/armor/armor.go similarity index 100% rename from internal/armor/armor.go rename to armor/armor.go diff --git a/internal/armor/armor_test.go b/armor/armor_test.go similarity index 97% rename from internal/armor/armor_test.go rename to armor/armor_test.go index 3317d80..4620b4e 100644 --- a/internal/armor/armor_test.go +++ b/armor/armor_test.go @@ -16,8 +16,8 @@ import ( "strings" "testing" - "filippo.io/age/internal/age" - "filippo.io/age/internal/armor" + "filippo.io/age/age" + "filippo.io/age/armor" ) func ExampleNewWriter() { diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go index 6a08c77..2c39b63 100644 --- a/cmd/age-keygen/keygen.go +++ b/cmd/age-keygen/keygen.go @@ -13,7 +13,7 @@ import ( "os" "time" - "filippo.io/age/internal/age" + "filippo.io/age/age" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/age/age.go b/cmd/age/age.go index 0185247..0ddf399 100644 --- a/cmd/age/age.go +++ b/cmd/age/age.go @@ -16,8 +16,8 @@ import ( "os" "strings" - "filippo.io/age/internal/age" - "filippo.io/age/internal/armor" + "filippo.io/age/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 8799887..5a62dd1 100644 --- a/cmd/age/age_test.go +++ b/cmd/age/age_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "filippo.io/age/internal/age" + "filippo.io/age/age" ) func TestVectors(t *testing.T) { diff --git a/cmd/age/encrypted_keys.go b/cmd/age/encrypted_keys.go index 61aa8d4..4ee71de 100644 --- a/cmd/age/encrypted_keys.go +++ b/cmd/age/encrypted_keys.go @@ -10,7 +10,7 @@ import ( "fmt" "os" - "filippo.io/age/internal/age" + "filippo.io/age/age" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/age/parse.go b/cmd/age/parse.go index 2402abb..17f7e7c 100644 --- a/cmd/age/parse.go +++ b/cmd/age/parse.go @@ -15,8 +15,8 @@ import ( "os" "strings" - "filippo.io/age/internal/age" - "filippo.io/age/internal/agessh" + "filippo.io/age/age" + "filippo.io/age/agessh" "golang.org/x/crypto/ssh" )