diff options
author | Adam Langley <agl@google.com> | 2015-09-24 10:57:52 -0700 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-09-24 11:04:03 -0700 |
commit | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch) | |
tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/tool/speed.cc | |
parent | 08656b61d075740bfb24ddcce65223146259fc02 (diff) | |
download | external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2 |
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
Diffstat (limited to 'src/tool/speed.cc')
-rw-r--r-- | src/tool/speed.cc | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/tool/speed.cc b/src/tool/speed.cc index ab17c2f..307b0b9 100644 --- a/src/tool/speed.cc +++ b/src/tool/speed.cc @@ -36,16 +36,9 @@ #endif #include "../crypto/test/scoped_types.h" +#include "internal.h" -extern "C" { -// These values are DER encoded, RSA private keys. -extern const uint8_t kDERRSAPrivate2048[]; -extern size_t kDERRSAPrivate2048Len; -extern const uint8_t kDERRSAPrivate4096[]; -extern size_t kDERRSAPrivate4096Len; -} - // TimeResults represents the results of benchmarking a function. struct TimeResults { // num_calls is the number of function calls done in the time period. @@ -414,9 +407,9 @@ bool Speed(const std::vector<std::string> &args) { selected = args[0]; } - RSA *key = NULL; - const uint8_t *inp = kDERRSAPrivate2048; - if (NULL == d2i_RSAPrivateKey(&key, &inp, kDERRSAPrivate2048Len)) { + RSA *key = RSA_private_key_from_bytes(kDERRSAPrivate2048, + kDERRSAPrivate2048Len); + if (key == NULL) { fprintf(stderr, "Failed to parse RSA key.\n"); ERR_print_errors_fp(stderr); return false; @@ -427,10 +420,22 @@ bool Speed(const std::vector<std::string> &args) { } RSA_free(key); - key = NULL; + key = RSA_private_key_from_bytes(kDERRSAPrivate3Prime2048, + kDERRSAPrivate3Prime2048Len); + if (key == NULL) { + fprintf(stderr, "Failed to parse RSA key.\n"); + ERR_print_errors_fp(stderr); + return false; + } - inp = kDERRSAPrivate4096; - if (NULL == d2i_RSAPrivateKey(&key, &inp, kDERRSAPrivate4096Len)) { + if (!SpeedRSA("RSA 2048 (3 prime, e=3)", key, selected)) { + return false; + } + + RSA_free(key); + key = RSA_private_key_from_bytes(kDERRSAPrivate4096, + kDERRSAPrivate4096Len); + if (key == NULL) { fprintf(stderr, "Failed to parse 4096-bit RSA key.\n"); ERR_print_errors_fp(stderr); return 1; |