This to avoid a clash with a #defined symbol on Solaris from time.h.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5064)
#define MAX_ECDH_SIZE 256
#define MISALIGN 64
#define MAX_ECDH_SIZE 256
#define MISALIGN 64
+typedef struct openssl_speed_sec_st {
int sym;
int rsa;
int dsa;
int ecdsa;
int ecdh;
int sym;
int rsa;
int dsa;
int ecdsa;
int ecdh;
static volatile int run = 0;
static volatile int run = 0;
#endif
static void multiblock_speed(const EVP_CIPHER *evp_cipher,
#endif
static void multiblock_speed(const EVP_CIPHER *evp_cipher,
+ const openssl_speed_sec_t *seconds);
static int found(const char *name, const OPT_PAIR *pairs, int *result)
{
static int found(const char *name, const OPT_PAIR *pairs, int *result)
{
int ecdh_doit[EC_NUM] = { 0 };
#endif /* ndef OPENSSL_NO_EC */
int ecdh_doit[EC_NUM] = { 0 };
#endif /* ndef OPENSSL_NO_EC */
- SEC seconds = {SECONDS, RSA_SECONDS, DSA_SECONDS, ECDSA_SECONDS,
- ECDH_SECONDS};
+ openssl_speed_sec_t seconds = { SECONDS, RSA_SECONDS, DSA_SECONDS,
+ ECDSA_SECONDS, ECDH_SECONDS };
prog = opt_init(argc, argv, speed_options);
while ((o = opt_next()) != OPT_EOF) {
prog = opt_init(argc, argv, speed_options);
while ((o = opt_next()) != OPT_EOF) {
-static void multiblock_speed(const EVP_CIPHER *evp_cipher, const SEC *seconds)
+static void multiblock_speed(const EVP_CIPHER *evp_cipher,
+ const openssl_speed_sec_t *seconds)
{
static const int mblengths_list[] =
{ 8 * 1024, 2 * 8 * 1024, 4 * 8 * 1024, 8 * 8 * 1024, 8 * 16 * 1024 };
{
static const int mblengths_list[] =
{ 8 * 1024, 2 * 8 * 1024, 4 * 8 * 1024, 8 * 8 * 1024, 8 * 16 * 1024 };