Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit f791ede32a14 · 2019-12-14T12:32:28.000-08:00
Pull crypto fix from Herbert Xu:
 "Fix another build problem for Wireguard without Crypto"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm/curve25519 - add arch-specific key generation function
diff --git a/arch/arm/crypto/curve25519-glue.c b/arch/arm/crypto/curve25519-glue.c
@@ -38,6 +38,13 @@ void curve25519_arch(u8 out[CURVE25519_KEY_SIZE],
 }
 EXPORT_SYMBOL(curve25519_arch);
 
+void curve25519_base_arch(u8 pub[CURVE25519_KEY_SIZE],
+			  const u8 secret[CURVE25519_KEY_SIZE])
+{
+	return curve25519_arch(pub, secret, curve25519_base_point);
+}
+EXPORT_SYMBOL(curve25519_base_arch);
+
 static int curve25519_set_secret(struct crypto_kpp *tfm, const void *buf,
 				 unsigned int len)
 {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,13 @@ void curve25519_arch(u8 out[CURVE25519_KEY_SIZE],`
`38`	`38`	`}`
`39`	`39`	`EXPORT_SYMBOL(curve25519_arch);`
`40`	`40`
	`41`	`+void curve25519_base_arch(u8 pub[CURVE25519_KEY_SIZE],`
	`42`	`+ const u8 secret[CURVE25519_KEY_SIZE])`
	`43`	`+{`
	`44`	`+ return curve25519_arch(pub, secret, curve25519_base_point);`
	`45`	`+}`
	`46`	`+EXPORT_SYMBOL(curve25519_base_arch);`
	`47`	`+`
`41`	`48`	`static int curve25519_set_secret(struct crypto_kpp tfm, const void buf,`
`42`	`49`	`unsigned int len)`
`43`	`50`	`{`