diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:46:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 02:46:08 +0000 |
| commit | 217603a4384148cd37c60a42f945449641617d27 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/tool/tool.cc | |
| parent | e246de8f184e644debf965ecdca552f006b56881 (diff) | |
| parent | d947d006e7a7ebcfdfe642e686250caf2028c2c1 (diff) | |
| download | external_boringssl-217603a4384148cd37c60a42f945449641617d27.zip external_boringssl-217603a4384148cd37c60a42f945449641617d27.tar.gz external_boringssl-217603a4384148cd37c60a42f945449641617d27.tar.bz2 | |
am d947d006: am b8494591: Revert "Revert "external/boringssl: sync with upstream.""
* commit 'd947d006e7a7ebcfdfe642e686250caf2028c2c1':
Revert "Revert "external/boringssl: sync with upstream.""
Diffstat (limited to 'src/tool/tool.cc')
| -rw-r--r-- | src/tool/tool.cc | 18 |
1 files changed, 10 insertions, 8 deletions
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<std::string> &args); -bool Server(const std::vector<std::string> &args); +bool DoPKCS12(const std::vector<std::string> &args); +bool GenerateRSAKey(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 DoPKCS12(const std::vector<std::string> &args); +bool Server(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); @@ -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 }, }; |