2 files changed, 20 insertions, 20 deletions

diff --git a/vendor/golang.org/x/crypto/openpgp/keys.go b/vendor/golang.org/x/crypto/openpgp/keys.go
index 3e25186..faa2fb3 100644
--- a/vendor/golang.org/x/crypto/openpgp/keys.go
+++ b/vendor/golang.org/x/crypto/openpgp/keys.go
@@ -504,7 +504,7 @@ const defaultRSAKeyBits = 2048
 // which may be empty but must not contain any of "()<>\x00".
 // If config is nil, sensible defaults will be used.
 func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) {
-        currentTime := config.Now()
+        creationTime := config.Now()
 
         bits := defaultRSAKeyBits
         if config != nil && config.RSABits != 0 {
@@ -525,8 +525,8 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err
         }
 
         e := &Entity{
-                PrimaryKey: packet.NewRSAPublicKey(currentTime, &signingPriv.PublicKey),
-                PrivateKey: packet.NewRSAPrivateKey(currentTime, signingPriv),
+                PrimaryKey: packet.NewRSAPublicKey(creationTime, &signingPriv.PublicKey),
+                PrivateKey: packet.NewRSAPrivateKey(creationTime, signingPriv),
                 Identities: make(map[string]*Identity),
         }
         isPrimaryId := true
@@ -534,7 +534,7 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err
                 Name:   uid.Id,
                 UserId: uid,
                 SelfSignature: &packet.Signature{
-                        CreationTime: currentTime,
+                        CreationTime: creationTime,
                         SigType:      packet.SigTypePositiveCert,
                         PubKeyAlgo:   packet.PubKeyAlgoRSA,
                         Hash:         config.Hash(),
@@ -563,10 +563,10 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err
 
         e.Subkeys = make([]Subkey, 1)
         e.Subkeys[0] = Subkey{
-                PublicKey:  packet.NewRSAPublicKey(currentTime, &encryptingPriv.PublicKey),
-                PrivateKey: packet.NewRSAPrivateKey(currentTime, encryptingPriv),
+                PublicKey:  packet.NewRSAPublicKey(creationTime, &encryptingPriv.PublicKey),
+                PrivateKey: packet.NewRSAPrivateKey(creationTime, encryptingPriv),
                 Sig: &packet.Signature{
-                        CreationTime:              currentTime,
+                        CreationTime:              creationTime,
                         SigType:                   packet.SigTypeSubkeyBinding,
                         PubKeyAlgo:                packet.PubKeyAlgoRSA,
                         Hash:                      config.Hash(),
diff --git a/vendor/golang.org/x/crypto/openpgp/packet/private_key.go b/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
index bd31cce..6f8ec09 100644
--- a/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
+++ b/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
@@ -36,49 +36,49 @@ type PrivateKey struct {
         iv            []byte
 }
 
-func NewRSAPrivateKey(currentTime time.Time, priv *rsa.PrivateKey) *PrivateKey {
+func NewRSAPrivateKey(creationTime time.Time, priv *rsa.PrivateKey) *PrivateKey {
         pk := new(PrivateKey)
-        pk.PublicKey = *NewRSAPublicKey(currentTime, &priv.PublicKey)
+        pk.PublicKey = *NewRSAPublicKey(creationTime, &priv.PublicKey)
         pk.PrivateKey = priv
         return pk
 }
 
-func NewDSAPrivateKey(currentTime time.Time, priv *dsa.PrivateKey) *PrivateKey {
+func NewDSAPrivateKey(creationTime time.Time, priv *dsa.PrivateKey) *PrivateKey {
         pk := new(PrivateKey)
-        pk.PublicKey = *NewDSAPublicKey(currentTime, &priv.PublicKey)
+        pk.PublicKey = *NewDSAPublicKey(creationTime, &priv.PublicKey)
         pk.PrivateKey = priv
         return pk
 }
 
-func NewElGamalPrivateKey(currentTime time.Time, priv *elgamal.PrivateKey) *PrivateKey {
+func NewElGamalPrivateKey(creationTime time.Time, priv *elgamal.PrivateKey) *PrivateKey {
         pk := new(PrivateKey)
-        pk.PublicKey = *NewElGamalPublicKey(currentTime, &priv.PublicKey)
+        pk.PublicKey = *NewElGamalPublicKey(creationTime, &priv.PublicKey)
         pk.PrivateKey = priv
         return pk
 }
 
-func NewECDSAPrivateKey(currentTime time.Time, priv *ecdsa.PrivateKey) *PrivateKey {
+func NewECDSAPrivateKey(creationTime time.Time, priv *ecdsa.PrivateKey) *PrivateKey {
         pk := new(PrivateKey)
-        pk.PublicKey = *NewECDSAPublicKey(currentTime, &priv.PublicKey)
+        pk.PublicKey = *NewECDSAPublicKey(creationTime, &priv.PublicKey)
         pk.PrivateKey = priv
         return pk
 }
 
 // NewSignerPrivateKey creates a PrivateKey from a crypto.Signer that
 // implements RSA or ECDSA.
-func NewSignerPrivateKey(currentTime time.Time, signer crypto.Signer) *PrivateKey {
+func NewSignerPrivateKey(creationTime time.Time, signer crypto.Signer) *PrivateKey {
         pk := new(PrivateKey)
         // In general, the public Keys should be used as pointers. We still
         // type-switch on the values, for backwards-compatibility.
         switch pubkey := signer.Public().(type) {
         case *rsa.PublicKey:
-                pk.PublicKey = *NewRSAPublicKey(currentTime, pubkey)
+                pk.PublicKey = *NewRSAPublicKey(creationTime, pubkey)
         case rsa.PublicKey:
-                pk.PublicKey = *NewRSAPublicKey(currentTime, &pubkey)
+                pk.PublicKey = *NewRSAPublicKey(creationTime, &pubkey)
         case *ecdsa.PublicKey:
-                pk.PublicKey = *NewECDSAPublicKey(currentTime, pubkey)
+                pk.PublicKey = *NewECDSAPublicKey(creationTime, pubkey)
         case ecdsa.PublicKey:
-                pk.PublicKey = *NewECDSAPublicKey(currentTime, &pubkey)
+                pk.PublicKey = *NewECDSAPublicKey(creationTime, &pubkey)
         default:
                 panic("openpgp: unknown crypto.Signer type in NewSignerPrivateKey")
         }