diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
| commit | a04d78d392463df4e69a64360c952ffa5abd22f7 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/tool/tool.cc | |
| parent | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff) | |
| download | external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2 | |
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.
This breaks some x86 builds.
Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/tool/tool.cc')
| -rw-r--r-- | src/tool/tool.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/tool/tool.cc b/src/tool/tool.cc index e4d5201..4bd7d1a 100644 --- a/src/tool/tool.cc +++ b/src/tool/tool.cc @@ -27,17 +27,16 @@ bool Client(const std::vector<std::string> &args); -bool DoPKCS12(const std::vector<std::string> &args); -bool GenerateRSAKey(const std::vector<std::string> &args); +bool Server(const std::vector<std::string> &args); bool MD5Sum(const std::vector<std::string> &args); -bool Rand(const std::vector<std::string> &args); bool SHA1Sum(const std::vector<std::string> &args); bool SHA224Sum(const std::vector<std::string> &args); bool SHA256Sum(const std::vector<std::string> &args); bool SHA384Sum(const std::vector<std::string> &args); bool SHA512Sum(const std::vector<std::string> &args); -bool Server(const std::vector<std::string> &args); +bool DoPKCS12(const std::vector<std::string> &args); bool Speed(const std::vector<std::string> &args); +bool Rand(const std::vector<std::string> &args); typedef bool (*tool_func_t)(const std::vector<std::string> &args); @@ -47,20 +46,19 @@ struct Tool { }; static const Tool kTools[] = { - { "client", Client }, - { "genrsa", GenerateRSAKey }, - { "md5sum", MD5Sum }, + { "speed", Speed }, { "pkcs12", DoPKCS12 }, - { "rand", Rand }, + { "client", Client }, { "s_client", Client }, - { "s_server", Server }, { "server", Server }, + { "s_server", Server }, + { "md5sum", MD5Sum }, { "sha1sum", SHA1Sum }, { "sha224sum", SHA224Sum }, { "sha256sum", SHA256Sum }, { "sha384sum", SHA384Sum }, { "sha512sum", SHA512Sum }, - { "speed", Speed }, + { "rand", Rand }, { "", nullptr }, }; |