fix(v2): Adapt NewForwardingEntity to refactored NewEntity

ProtonMail · Feb 28, 2024 · 54e58ae · 54e58ae
1 parent 16f8541
commit 54e58ae
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/openpgp/v2/forwarding.go b/openpgp/v2/forwarding.go
@@ -33,7 +33,6 @@ func (e *Entity) NewForwardingEntity(
 	// Generate a new Primary key for the forwardee
 	config.Algorithm = packet.PubKeyAlgoEdDSA
 	config.Curve = packet.Curve25519
-	keyLifetimeSecs := config.KeyLifetime()
 
 	forwardeePrimaryPrivRaw, err := newSigner(config)
 	if err != nil {
@@ -49,7 +48,8 @@ func (e *Entity) NewForwardingEntity(
 		Subkeys:    []Subkey{},
 	}
 
-	err = forwardeeKey.addUserId(userIdData{name, comment, email}, config, now, keyLifetimeSecs, true)
+	keyProperties := selectKeyProperties(now, config, primary)
+	err = forwardeeKey.addUserId(userIdData{name, comment, email}, config, keyProperties)
 	if err != nil {
 		return nil, nil, err
 	}