From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- src/tool/tool.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/tool/tool.cc') diff --git a/src/tool/tool.cc b/src/tool/tool.cc index 4bd7d1a..e4d5201 100644 --- a/src/tool/tool.cc +++ b/src/tool/tool.cc @@ -27,16 +27,17 @@ bool Client(const std::vector &args); -bool Server(const std::vector &args); +bool DoPKCS12(const std::vector &args); +bool GenerateRSAKey(const std::vector &args); bool MD5Sum(const std::vector &args); +bool Rand(const std::vector &args); bool SHA1Sum(const std::vector &args); bool SHA224Sum(const std::vector &args); bool SHA256Sum(const std::vector &args); bool SHA384Sum(const std::vector &args); bool SHA512Sum(const std::vector &args); -bool DoPKCS12(const std::vector &args); +bool Server(const std::vector &args); bool Speed(const std::vector &args); -bool Rand(const std::vector &args); typedef bool (*tool_func_t)(const std::vector &args); @@ -46,19 +47,20 @@ struct Tool { }; static const Tool kTools[] = { - { "speed", Speed }, - { "pkcs12", DoPKCS12 }, { "client", Client }, + { "genrsa", GenerateRSAKey }, + { "md5sum", MD5Sum }, + { "pkcs12", DoPKCS12 }, + { "rand", Rand }, { "s_client", Client }, - { "server", Server }, { "s_server", Server }, - { "md5sum", MD5Sum }, + { "server", Server }, { "sha1sum", SHA1Sum }, { "sha224sum", SHA224Sum }, { "sha256sum", SHA256Sum }, { "sha384sum", SHA384Sum }, { "sha512sum", SHA512Sum }, - { "rand", Rand }, + { "speed", Speed }, { "", nullptr }, }; -- cgit v1.1