diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 562e6e5..a0db29f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: - # Please edit to your GitLab project - REPO_NAME: github.com/ProtonMail/go-pm-crypto + REPO_NAME: github.com/ProtonMail/gopenpgp before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' diff --git a/README.md b/README.md index 9d9eb31..0f9f45b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Download/Install -Manually `git clone` the repository into `$GOPATH/src/github.com/ProtonMail/go-pm-crypto`. +Run `go get -u github.com/ProtonMail/gopenpgp`, or manually `git clone` the +repository into `$GOPATH/src/github.com/ProtonMail/gopenpgp`. This library is meant to be used together with https://github.com/ProtonMail/crypto. diff --git a/armor/armor.go b/armor/armor.go index fdde685..ad051be 100644 --- a/armor/armor.go +++ b/armor/armor.go @@ -4,8 +4,8 @@ package armor import ( "bytes" "errors" - "github.com/ProtonMail/go-pm-crypto/constants" - "github.com/ProtonMail/go-pm-crypto/internal" + "github.com/ProtonMail/gopenpgp/constants" + "github.com/ProtonMail/gopenpgp/internal" "golang.org/x/crypto/openpgp/armor" "golang.org/x/crypto/openpgp/clearsign" "io" diff --git a/build.sh b/build.sh index cab3021..f37db32 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ mkdir -p $IOS_OUT # CHECK="${1-0}" # if [ ${CHECK} -eq "1" ]; then printf "\e[0;32mStart Building iOS framework .. Location: ${IOS_OUT} \033[0m\n\n" -PACKAGE_PATH=github.com/ProtonMail/go-pm-crypto +PACKAGE_PATH=github.com/ProtonMail/gopenpgp gomobile bind -target ios -o ${IOS_OUT}/Crypto.framework $PACKAGE_PATH/crypto $PACKAGE_PATH/armor $PACKAGE_PATH/constants $PACKAGE_PATH/key $PACKAGE_PATH/models diff --git a/crypto/attachment.go b/crypto/attachment.go index 8354422..62d35f7 100644 --- a/crypto/attachment.go +++ b/crypto/attachment.go @@ -8,9 +8,9 @@ import ( "runtime" "sync" - armorUtils "github.com/ProtonMail/go-pm-crypto/armor" - "github.com/ProtonMail/go-pm-crypto/constants" - "github.com/ProtonMail/go-pm-crypto/models" + armorUtils "github.com/ProtonMail/gopenpgp/armor" + "github.com/ProtonMail/gopenpgp/constants" + "github.com/ProtonMail/gopenpgp/models" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/packet" ) diff --git a/crypto/key.go b/crypto/key.go index d068404..85f4571 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "github.com/ProtonMail/go-pm-crypto/armor" - "github.com/ProtonMail/go-pm-crypto/constants" - "github.com/ProtonMail/go-pm-crypto/models" + "github.com/ProtonMail/gopenpgp/armor" + "github.com/ProtonMail/gopenpgp/constants" + "github.com/ProtonMail/gopenpgp/models" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/packet" diff --git a/crypto/key_test.go b/crypto/key_test.go index cbc750c..44e24c0 100644 --- a/crypto/key_test.go +++ b/crypto/key_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/ProtonMail/go-pm-crypto/constants" + "github.com/ProtonMail/gopenpgp/constants" "github.com/stretchr/testify/assert" ) diff --git a/crypto/keyring.go b/crypto/keyring.go index 3b14c34..f92c843 100644 --- a/crypto/keyring.go +++ b/crypto/keyring.go @@ -19,9 +19,9 @@ import ( "golang.org/x/crypto/openpgp/packet" xrsa "golang.org/x/crypto/rsa" - armorUtils "github.com/ProtonMail/go-pm-crypto/armor" - "github.com/ProtonMail/go-pm-crypto/constants" - "github.com/ProtonMail/go-pm-crypto/models" + armorUtils "github.com/ProtonMail/gopenpgp/armor" + "github.com/ProtonMail/gopenpgp/constants" + "github.com/ProtonMail/gopenpgp/models" ) // A keypair contains a private key and a public key. @@ -399,7 +399,7 @@ func (kr *KeyRing) Unlock(passphrase []byte) error { } if len(keys) == 0 { - return errors.New("go-pm-crypto: cannot unlock key ring, no private key available") + return errors.New("gopenpgp: cannot unlock key ring, no private key available") } var err error diff --git a/crypto/keyring_test.go b/crypto/keyring_test.go index 3021f22..b0efd55 100644 --- a/crypto/keyring_test.go +++ b/crypto/keyring_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/openpgp/armor" - "github.com/ProtonMail/go-pm-crypto/constants" + "github.com/ProtonMail/gopenpgp/constants" "github.com/stretchr/testify/assert" ) diff --git a/crypto/message.go b/crypto/message.go index 52ddd56..e9f3ea4 100644 --- a/crypto/message.go +++ b/crypto/message.go @@ -14,10 +14,10 @@ import ( pgpErrors "golang.org/x/crypto/openpgp/errors" "golang.org/x/crypto/openpgp/packet" - armorUtils "github.com/ProtonMail/go-pm-crypto/armor" - "github.com/ProtonMail/go-pm-crypto/constants" - "github.com/ProtonMail/go-pm-crypto/internal" - "github.com/ProtonMail/go-pm-crypto/models" + armorUtils "github.com/ProtonMail/gopenpgp/armor" + "github.com/ProtonMail/gopenpgp/constants" + "github.com/ProtonMail/gopenpgp/internal" + "github.com/ProtonMail/gopenpgp/models" ) // DecryptMessageStringKey decrypts encrypted message use private key (string) diff --git a/crypto/mime_test.go b/crypto/mime_test.go index 2db577a..7618592 100644 --- a/crypto/mime_test.go +++ b/crypto/mime_test.go @@ -2,7 +2,7 @@ package crypto import ( "github.com/stretchr/testify/assert" - "github.com/ProtonMail/go-pm-crypto/internal" + "github.com/ProtonMail/gopenpgp/internal" "io/ioutil" "testing" ) diff --git a/crypto/session.go b/crypto/session.go index 85e4f24..401254d 100644 --- a/crypto/session.go +++ b/crypto/session.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/ProtonMail/go-pm-crypto/armor" - "github.com/ProtonMail/go-pm-crypto/constants" + "github.com/ProtonMail/gopenpgp/armor" + "github.com/ProtonMail/gopenpgp/constants" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/packet" diff --git a/crypto/sign_detached.go b/crypto/sign_detached.go index e809331..6462690 100644 --- a/crypto/sign_detached.go +++ b/crypto/sign_detached.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/ProtonMail/go-pm-crypto/internal" + "github.com/ProtonMail/gopenpgp/internal" "golang.org/x/crypto/openpgp" errorsPGP "golang.org/x/crypto/openpgp/errors" diff --git a/internal/common.go b/internal/common.go index 7653355..66d8356 100644 --- a/internal/common.go +++ b/internal/common.go @@ -1,7 +1,7 @@ package internal import ( - "github.com/ProtonMail/go-pm-crypto/constants" + "github.com/ProtonMail/gopenpgp/constants" "regexp" )