lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update x/crypto fork to github.com/ProtonMail/go-crypto (#106)

Browse source
This commit is contained in:
Daniel Huigens 2020-12-08 18:34:39 +01:00 • committed by GitHub
parent 6105a3bcc0
commit d0daa53ca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crypto/attachment.go
View file

@ -8,9 +8,9 @@ import (
"sync"
"time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// AttachmentProcessor keeps track of the progress of encrypting an attachment

6
crypto/base_test.go
View file

@ -6,9 +6,9 @@ import (
"strings"
"testing"
"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/openpgp/ecdh"
"golang.org/x/crypto/rsa"
"github.com/ProtonMail/go-crypto/ed25519"
"github.com/ProtonMail/go-crypto/openpgp/ecdh"
"github.com/ProtonMail/go-crypto/rsa"
"github.com/stretchr/testify/assert"
)

4
crypto/key.go
View file

@ -15,8 +15,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/pkg/errors"
openpgp "golang.org/x/crypto/openpgp"
packet "golang.org/x/crypto/openpgp/packet"
openpgp "github.com/ProtonMail/go-crypto/openpgp"
packet "github.com/ProtonMail/go-crypto/openpgp/packet"
)
// Key contains a single private or public key.

8
crypto/key_clear.go
View file

@ -6,10 +6,10 @@ import (
"errors"
"math/big"
"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/openpgp/ecdh"
"golang.org/x/crypto/openpgp/elgamal"
"golang.org/x/crypto/rsa"
"github.com/ProtonMail/go-crypto/ed25519"
"github.com/ProtonMail/go-crypto/openpgp/ecdh"
"github.com/ProtonMail/go-crypto/openpgp/elgamal"
"github.com/ProtonMail/go-crypto/rsa"
)
func (sk *SessionKey) Clear() (ok bool) {

6
crypto/key_test.go
View file

@ -7,9 +7,9 @@ import (
"strings"
"testing"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor"
"golang.org/x/crypto/rsa"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/armor"
"github.com/ProtonMail/go-crypto/rsa"
"github.com/stretchr/testify/assert"
)

4
crypto/keyring.go
View file

@ -4,9 +4,9 @@ import (
"bytes"
"time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// KeyRing contains multiple private and public keys.

4
crypto/keyring_message.go
View file

@ -6,10 +6,10 @@ import (
"io"
"io/ioutil"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// Encrypt encrypts a PlainMessage, outputs a PGPMessage.

2
crypto/keyring_session.go
View file

@ -6,7 +6,7 @@ import (
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp/packet"
"github.com/ProtonMail/go-crypto/openpgp/packet"
)
// DecryptSessionKey returns the decrypted session key from one or multiple binary encrypted session key packets.

6
crypto/keyring_test.go
View file

@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/assert"
"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/openpgp/ecdh"
"golang.org/x/crypto/rsa"
"github.com/ProtonMail/go-crypto/ed25519"
"github.com/ProtonMail/go-crypto/openpgp/ecdh"
"github.com/ProtonMail/go-crypto/rsa"
)
var testSymmetricKey []byte

4
crypto/message.go
View file

@ -11,12 +11,12 @@ import (
"strings"
"time"
"github.com/ProtonMail/go-crypto/openpgp/clearsign"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/ProtonMail/gopenpgp/v2/armor"
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/internal"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp/clearsign"
"golang.org/x/crypto/openpgp/packet"
)
// ---- MODELS -----

2
crypto/message_test.go
View file

@ -8,8 +8,8 @@ import (
"testing"
"time"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/stretchr/testify/assert"
"golang.org/x/crypto/openpgp/packet"
)
func TestTextMessageEncryptionWithPassword(t *testing.T) {

4
crypto/mime.go
View file

@ -7,10 +7,10 @@ import (
"net/textproto"
"strings"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
gomime "github.com/ProtonMail/go-mime"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// MIMECallbacks defines callback methods to process a MIME message.

4
crypto/password.go
View file

@ -4,9 +4,9 @@ import (
"bytes"
"io"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// EncryptMessageWithPassword encrypts a PlainMessage to PGPMessage with a

4
crypto/sessionkey.go
View file

@ -9,8 +9,8 @@ import (
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
)
// SessionKey stores a decrypted session key.

6
crypto/signature.go
View file

@ -9,9 +9,9 @@ import (
"math"
"time"
"golang.org/x/crypto/openpgp"
pgpErrors "golang.org/x/crypto/openpgp/errors"
"golang.org/x/crypto/openpgp/packet"
"github.com/ProtonMail/go-crypto/openpgp"
pgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/internal"

4
crypto/signature_collector.go
View file

@ -7,10 +7,10 @@ import (
"mime"
"net/textproto"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
gomime "github.com/ProtonMail/go-mime"
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
// SignatureCollector structure.