diff options
Diffstat (limited to 'vendor/golang.org/x/crypto/openpgp/keys.go')
-rw-r--r-- | vendor/golang.org/x/crypto/openpgp/keys.go | 14 |
1 files changed, 7 insertions, 7 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 | |||
504 | // which may be empty but must not contain any of "()<>\x00". | 504 | // which may be empty but must not contain any of "()<>\x00". |
505 | // If config is nil, sensible defaults will be used. | 505 | // If config is nil, sensible defaults will be used. |
506 | func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) { | 506 | func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) { |
507 | currentTime := config.Now() | 507 | creationTime := config.Now() |
508 | 508 | ||
509 | bits := defaultRSAKeyBits | 509 | bits := defaultRSAKeyBits |
510 | if config != nil && config.RSABits != 0 { | 510 | if config != nil && config.RSABits != 0 { |
@@ -525,8 +525,8 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err | |||
525 | } | 525 | } |
526 | 526 | ||
527 | e := &Entity{ | 527 | e := &Entity{ |
528 | PrimaryKey: packet.NewRSAPublicKey(currentTime, &signingPriv.PublicKey), | 528 | PrimaryKey: packet.NewRSAPublicKey(creationTime, &signingPriv.PublicKey), |
529 | PrivateKey: packet.NewRSAPrivateKey(currentTime, signingPriv), | 529 | PrivateKey: packet.NewRSAPrivateKey(creationTime, signingPriv), |
530 | Identities: make(map[string]*Identity), | 530 | Identities: make(map[string]*Identity), |
531 | } | 531 | } |
532 | isPrimaryId := true | 532 | isPrimaryId := true |
@@ -534,7 +534,7 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err | |||
534 | Name: uid.Id, | 534 | Name: uid.Id, |
535 | UserId: uid, | 535 | UserId: uid, |
536 | SelfSignature: &packet.Signature{ | 536 | SelfSignature: &packet.Signature{ |
537 | CreationTime: currentTime, | 537 | CreationTime: creationTime, |
538 | SigType: packet.SigTypePositiveCert, | 538 | SigType: packet.SigTypePositiveCert, |
539 | PubKeyAlgo: packet.PubKeyAlgoRSA, | 539 | PubKeyAlgo: packet.PubKeyAlgoRSA, |
540 | Hash: config.Hash(), | 540 | Hash: config.Hash(), |
@@ -563,10 +563,10 @@ func NewEntity(name, comment, email string, config *packet.Config) (*Entity, err | |||
563 | 563 | ||
564 | e.Subkeys = make([]Subkey, 1) | 564 | e.Subkeys = make([]Subkey, 1) |
565 | e.Subkeys[0] = Subkey{ | 565 | e.Subkeys[0] = Subkey{ |
566 | PublicKey: packet.NewRSAPublicKey(currentTime, &encryptingPriv.PublicKey), | 566 | PublicKey: packet.NewRSAPublicKey(creationTime, &encryptingPriv.PublicKey), |
567 | PrivateKey: packet.NewRSAPrivateKey(currentTime, encryptingPriv), | 567 | PrivateKey: packet.NewRSAPrivateKey(creationTime, encryptingPriv), |
568 | Sig: &packet.Signature{ | 568 | Sig: &packet.Signature{ |
569 | CreationTime: currentTime, | 569 | CreationTime: creationTime, |
570 | SigType: packet.SigTypeSubkeyBinding, | 570 | SigType: packet.SigTypeSubkeyBinding, |
571 | PubKeyAlgo: packet.PubKeyAlgoRSA, | 571 | PubKeyAlgo: packet.PubKeyAlgoRSA, |
572 | Hash: config.Hash(), | 572 | Hash: config.Hash(), |