keygen-html: remove prebuilt file

We also reduce the optimization level, just in case, but add closure
compiler into the mix.

Suggested-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 2 insertions, 22 deletions

diff --git a/contrib/keygen-html/keygen.html b/contrib/keygen-html/keygen.html
index d12f6b9..8b3e853 100644
--- a/contrib/keygen-html/keygen.html
+++ b/contrib/keygen-html/keygen.html
@@ -1,29 +1,9 @@
-<script src="curve25519_generate.js"></script>
+<script src="curve25519_generate.js" onError='document.write("<h3>Did you forget to run \"make\" to compile curve25519_generate.js?</h3><!--");'></script>
 <script>
 /* SPDX-License-Identifier: GPL-2.0
  *
  * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
-function generateWireguardKeypair()
-{
-	var privateKey = Module._malloc(32);
-	var publicKey = Module._malloc(32);
-	Module._curve25519_generate_private(privateKey);
-	Module._curve25519_generate_public(publicKey, privateKey);
-	var privateBase64 = Module._malloc(45);
-	var publicBase64 = Module._malloc(45);
-	Module._key_to_base64(privateBase64, privateKey);
-	Module._key_to_base64(publicBase64, publicKey);
-	Module._free(privateKey);
-	Module._free(publicKey);
-	var keypair = {
-		publicKey: Module.Pointer_stringify(publicBase64),
-		privateKey: Module.Pointer_stringify(privateBase64)
-	};
-	Module._free(privateBase64);
-	Module._free(publicBase64);
-	return keypair;
-}
 
 function sendPubkeyToServer(pubkey, username, password)
 {
@@ -44,7 +24,7 @@ function sendPubkeyToServer(pubkey, username, password)
 
 function downloadNewConfiguration()
 {
-	var keypair = generateWireguardKeypair();
+	var keypair = WireGuard.generateKeypair();
 	var serverResponse = sendPubkeyToServer(keypair.publicKey, "zx2c4", "supersecretpassword");
 
 	var config = [];