Use curve25519.ScalarSize to specify derived key length

awnumar · awnumar · commit a92b3069d95e · 2024-11-09T22:16:45.000Z
diff --git a/keygen.go b/keygen.go
@@ -33,12 +33,12 @@ func X25519IdentityFromKey(key, salt []byte) (*age.X25519Identity, error) {
 
 // X25519IdentityFromPassword derives an age identity from a password using Argon2id, with strong default parameters.
 func X25519IdentityFromPassword(password, salt []byte) (*age.X25519Identity, error) {
-	return newX25519IdentityFromScalar(argon2.IDKey(password, salt, DefaultArgon2idTime, DefaultArgon2idMemory, DefaultArgon2idThreads, 32))
+	return newX25519IdentityFromScalar(argon2.IDKey(password, salt, DefaultArgon2idTime, DefaultArgon2idMemory, DefaultArgon2idThreads, curve25519.ScalarSize))
 }
 
 // X25519IdentityFromPasswordWithParameters derives an age identity from a password, with custom Argon2id parameters.
 func X25519IdentityFromPasswordWithParameters(password, salt []byte, argon2idTime, argon2idMemory uint32, argon2idThreads uint8) (*age.X25519Identity, error) {
-	return newX25519IdentityFromScalar(argon2.IDKey(password, salt, argon2idTime, argon2idMemory, argon2idThreads, 32))
+	return newX25519IdentityFromScalar(argon2.IDKey(password, salt, argon2idTime, argon2idMemory, argon2idThreads, curve25519.ScalarSize))
 }
 
 // newX25519IdentityFromScalar returns a new X25519Identity from a raw Curve25519 scalar.

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ func X25519IdentityFromKey(key, salt []byte) (*age.X25519Identity, error) {`
`33`	`33`
`34`	`34`	`// X25519IdentityFromPassword derives an age identity from a password using Argon2id, with strong default parameters.`
`35`	`35`	`func X25519IdentityFromPassword(password, salt []byte) (*age.X25519Identity, error) {`
`36`		`- return newX25519IdentityFromScalar(argon2.IDKey(password, salt, DefaultArgon2idTime, DefaultArgon2idMemory, DefaultArgon2idThreads, 32))`
	`36`	`+ return newX25519IdentityFromScalar(argon2.IDKey(password, salt, DefaultArgon2idTime, DefaultArgon2idMemory, DefaultArgon2idThreads, curve25519.ScalarSize))`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// X25519IdentityFromPasswordWithParameters derives an age identity from a password, with custom Argon2id parameters.`
`40`	`40`	`func X25519IdentityFromPasswordWithParameters(password, salt []byte, argon2idTime, argon2idMemory uint32, argon2idThreads uint8) (*age.X25519Identity, error) {`
`41`		`- return newX25519IdentityFromScalar(argon2.IDKey(password, salt, argon2idTime, argon2idMemory, argon2idThreads, 32))`
	`41`	`+ return newX25519IdentityFromScalar(argon2.IDKey(password, salt, argon2idTime, argon2idMemory, argon2idThreads, curve25519.ScalarSize))`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// newX25519IdentityFromScalar returns a new X25519Identity from a raw Curve25519 scalar.`