From 486e1220a131045bc621d728d83c27d79b8320b9 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Sat, 25 Apr 2020 16:03:49 +0200
Subject: [PATCH] Update ProtonMail/crypto (#42)

---
 README.md         | 2 +-
 crypto/key.go     | 6 +-----
 crypto/keyring.go | 2 +-
 go.mod            | 2 +-
 go.sum            | 9 ++-------
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0075e7f..8fc59c7 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ require (
     github.com/ProtonMail/gopenpgp/v2 v2.0.0
 )
 
-replace golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20191122234321-e77a1f03baa0
+replace golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20200416114516-1fa7f403fb9c
 ```
 
 It can then be installed by running:
diff --git a/crypto/key.go b/crypto/key.go
index 1125d3e..2328fdb 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -177,7 +177,7 @@ func (key *Key) Serialize() ([]byte, error) {
 	if key.entity.PrivateKey == nil {
 		err = key.entity.Serialize(&buffer)
 	} else {
-		err = key.entity.SerializePrivateNoSign(&buffer, nil)
+		err = key.entity.SerializePrivateWithoutSigning(&buffer, nil)
 	}
 
 	return buffer.Bytes(), err
@@ -415,10 +415,6 @@ func generateKey(
 		return nil, err
 	}
 
-	if err := newEntity.SelfSign(nil); err != nil {
-		return nil, err
-	}
-
 	if newEntity.PrivateKey == nil {
 		return nil, errors.New("gopenpgp: error in generating private key")
 	}
diff --git a/crypto/keyring.go b/crypto/keyring.go
index 4bb5c57..75fc316 100644
--- a/crypto/keyring.go
+++ b/crypto/keyring.go
@@ -195,7 +195,7 @@ func (keyRing *KeyRing) Copy() (*KeyRing, error) {
 		if entity.PrivateKey == nil {
 			err = entity.Serialize(&buffer)
 		} else {
-			err = entity.SerializePrivateNoSign(&buffer, nil)
+			err = entity.SerializePrivateWithoutSigning(&buffer, nil)
 		}
 
 		if err != nil {
diff --git a/go.mod b/go.mod
index 10765d8..1b36438 100644
--- a/go.mod
+++ b/go.mod
@@ -9,4 +9,4 @@ require (
 	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
 )
 
-replace golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20200406171318-1e8bf1c40869
+replace golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20200416114516-1fa7f403fb9c
diff --git a/go.sum b/go.sum
index 5a3672d..a0e92d3 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,5 @@
-github.com/ProtonMail/crypto v0.0.0-20191122234321-e77a1f03baa0 h1:mCww5Yl0Pm4PZPSooupyWDgihrh96p6+O4PY1hs0FBw=
-github.com/ProtonMail/crypto v0.0.0-20191122234321-e77a1f03baa0/go.mod h1:MBriIAodHvZ+YvwvMJWCTmseW/LkeVRPWp/iZKvee4g=
-github.com/ProtonMail/crypto v0.0.0-20200406132833-0ff9e5f60587 h1:tRJioacMtJwCdlCHRaUl/2VfVNazf+ypT+SV5eiLnVY=
-github.com/ProtonMail/crypto v0.0.0-20200406132833-0ff9e5f60587/go.mod h1:MBriIAodHvZ+YvwvMJWCTmseW/LkeVRPWp/iZKvee4g=
-github.com/ProtonMail/crypto v0.0.0-20200406145536-081a35660375/go.mod h1:MBriIAodHvZ+YvwvMJWCTmseW/LkeVRPWp/iZKvee4g=
-github.com/ProtonMail/crypto v0.0.0-20200406171318-1e8bf1c40869 h1:GtxsVknmfEUppe8lCX/Xgs+BbCzXf9bdH8+eBbtGO70=
-github.com/ProtonMail/crypto v0.0.0-20200406171318-1e8bf1c40869/go.mod h1:MBriIAodHvZ+YvwvMJWCTmseW/LkeVRPWp/iZKvee4g=
+github.com/ProtonMail/crypto v0.0.0-20200416114516-1fa7f403fb9c h1:DAvlgde2Stu18slmjwikiMPs/CKPV35wSvmJS34z0FU=
+github.com/ProtonMail/crypto v0.0.0-20200416114516-1fa7f403fb9c/go.mod h1:Pxr7w4gA2ikI4sWyYwEffm+oew1WAJHzG1SiDpQMkrI=
 github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4=
 github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=