diff --git a/Makefile b/Makefile
index 0d9ea2a..9a3dddf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
-all: server
+all: auth-server gen-pubkeypair
 
-server: server.cc
-	g++ -o server server.cc nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a
+auth-server: auth-server.cc
+	g++ -o auth-server auth-server.cc nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a
+
+gen-pubkeypair: gen-pubkeypair.cc
+	g++ -o gen-pubkeypair gen-pubkeypair.cc nacl/build/instance1/lib/amd64/randombytes.o nacl/build/instance1/lib/amd64/libnacl.a
diff --git a/gen-pubkeypair.cc b/gen-pubkeypair.cc
new file mode 100644
index 0000000..4b9aa86
--- /dev/null
+++ b/gen-pubkeypair.cc
@@ -0,0 +1,30 @@
+#include <iostream>
+
+#include "nacl/build/instance1/include/amd64/crypto_box.h"
+
+class CryptoBase {
+	public:
+		static const std::string BinToHex(const std::string& bin) {
+			static const char *hex = "0123456789ABCDEF";
+			std::string ret;
+			ret.reserve(bin.length() * 2);
+			for (size_t i = 0; i < bin.length(); i++) {
+				const char c = bin[i];
+				ret.push_back(hex[(c & 0xf0) >> 4]);
+				ret.push_back(hex[c & 0x0f]);
+			}
+			return ret;
+		}
+};
+
+int main() {
+	std::string pk;
+	std::string sk;
+
+	pk = crypto_box_keypair(&sk);
+
+	std::cout << "Secret: " << CryptoBase::BinToHex(sk) << std::endl;
+	std::cout << "Public: " << CryptoBase::BinToHex(pk) << std::endl;
+
+	return 0;
+}
diff --git a/server.cc b/server.cc
deleted file mode 100644
index 4ffa1cb..0000000
--- a/server.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <iostream>
-
-#include "nacl/build/instance1/include/amd64/crypto_box.h"
-
-int main() {
-	std::string pk;
-	std::string sk;
-
-	pk = crypto_box_keypair(&sk);
-
-	std::cout << pk.size() << std::endl;
-
-	return 0;
-}