Latest update.
This commit is contained in:
+459
-601
@@ -17,6 +17,9 @@
|
||||
#define EdDSA_SECONDS 10
|
||||
#define SM2_SECONDS 10
|
||||
|
||||
/* We need to use some deprecated APIs */
|
||||
#define OPENSSL_SUPPRESS_DEPRECATED
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -41,7 +44,9 @@
|
||||
#ifndef OPENSSL_NO_DES
|
||||
# include <openssl/des.h>
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
#include <openssl/aes.h>
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
# include <openssl/camellia.h>
|
||||
#endif
|
||||
@@ -133,72 +138,9 @@ typedef struct openssl_speed_sec_st {
|
||||
|
||||
static volatile int run = 0;
|
||||
|
||||
static int mr = 0;
|
||||
static int mr = 0; /* machine-readeable output format to merge fork results */
|
||||
static int usertime = 1;
|
||||
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
static int EVP_Digest_MD2_loop(void *args);
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_MDC2
|
||||
static int EVP_Digest_MDC2_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
static int EVP_Digest_MD4_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MD5
|
||||
static int MD5_loop(void *args);
|
||||
static int HMAC_loop(void *args);
|
||||
#endif
|
||||
static int SHA1_loop(void *args);
|
||||
static int SHA256_loop(void *args);
|
||||
static int SHA512_loop(void *args);
|
||||
#ifndef OPENSSL_NO_WHIRLPOOL
|
||||
static int WHIRLPOOL_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RMD160
|
||||
static int EVP_Digest_RMD160_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
static int RC4_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
static int DES_ncbc_encrypt_loop(void *args);
|
||||
static int DES_ede3_cbc_encrypt_loop(void *args);
|
||||
#endif
|
||||
static int AES_cbc_128_encrypt_loop(void *args);
|
||||
static int AES_cbc_192_encrypt_loop(void *args);
|
||||
static int AES_cbc_256_encrypt_loop(void *args);
|
||||
#if !OPENSSL_API_3
|
||||
static int AES_ige_128_encrypt_loop(void *args);
|
||||
static int AES_ige_192_encrypt_loop(void *args);
|
||||
static int AES_ige_256_encrypt_loop(void *args);
|
||||
#endif
|
||||
static int CRYPTO_gcm128_aad_loop(void *args);
|
||||
static int RAND_bytes_loop(void *args);
|
||||
static int EVP_Update_loop(void *args);
|
||||
static int EVP_Update_loop_ccm(void *args);
|
||||
static int EVP_Update_loop_aead(void *args);
|
||||
static int EVP_Digest_loop(void *args);
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
static int RSA_sign_loop(void *args);
|
||||
static int RSA_verify_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
static int DSA_sign_loop(void *args);
|
||||
static int DSA_verify_loop(void *args);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
static int ECDSA_sign_loop(void *args);
|
||||
static int ECDSA_verify_loop(void *args);
|
||||
static int EdDSA_sign_loop(void *args);
|
||||
static int EdDSA_verify_loop(void *args);
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
static int SM2_sign_loop(void *args);
|
||||
static int SM2_verify_loop(void *args);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
static double Time_F(int s);
|
||||
static void print_message(const char *s, long num, int length, int tm);
|
||||
static void pkey_print_message(const char *str, const char *str2,
|
||||
@@ -211,6 +153,7 @@ static int do_multi(int multi, int size_num);
|
||||
static const int lengths_list[] = {
|
||||
16, 64, 256, 1024, 8 * 1024, 16 * 1024
|
||||
};
|
||||
#define SIZE_NUM OSSL_NELEM(lengths_list)
|
||||
static const int *lengths = lengths_list;
|
||||
|
||||
static const int aead_lengths_list[] = {
|
||||
@@ -292,8 +235,6 @@ static double Time_F(int s)
|
||||
static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
|
||||
const openssl_speed_sec_t *seconds);
|
||||
|
||||
#define found(value, pairs, result)\
|
||||
opt_found(value, result, pairs, OSSL_NELEM(pairs))
|
||||
static int opt_found(const char *name, unsigned int *result,
|
||||
const OPT_PAIR pairs[], unsigned int nbelem)
|
||||
{
|
||||
@@ -306,6 +247,8 @@ static int opt_found(const char *name, unsigned int *result,
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#define opt_found(value, pairs, result)\
|
||||
opt_found(value, result, pairs, OSSL_NELEM(pairs))
|
||||
|
||||
typedef enum OPTION_choice {
|
||||
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
||||
@@ -315,18 +258,10 @@ typedef enum OPTION_choice {
|
||||
} OPTION_CHOICE;
|
||||
|
||||
const OPTIONS speed_options[] = {
|
||||
{OPT_HELP_STR, 1, '-', "Usage: %s [options] ciphers...\n"},
|
||||
{OPT_HELP_STR, 1, '-', "Valid options are:\n"},
|
||||
{OPT_HELP_STR, 1, '-', "Usage: %s [options] [algorithm...]\n"},
|
||||
|
||||
OPT_SECTION("General"),
|
||||
{"help", OPT_HELP, '-', "Display this summary"},
|
||||
{"evp", OPT_EVP, 's', "Use EVP-named cipher or digest"},
|
||||
{"hmac", OPT_HMAC, 's', "HMAC using EVP-named digest"},
|
||||
#ifndef OPENSSL_NO_CMAC
|
||||
{"cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher"},
|
||||
#endif
|
||||
{"decrypt", OPT_DECRYPT, '-',
|
||||
"Time decryption instead of encryption (only EVP)"},
|
||||
{"aead", OPT_AEAD, '-',
|
||||
"Benchmark EVP-named AEAD cipher in TLS-like sequence"},
|
||||
{"mb", OPT_MB, '-',
|
||||
"Enable (tls1>=1) multi-block mode on EVP-named cipher"},
|
||||
{"mr", OPT_MR, '-', "Produce machine readable output"},
|
||||
@@ -337,58 +272,51 @@ const OPTIONS speed_options[] = {
|
||||
{"async_jobs", OPT_ASYNCJOBS, 'p',
|
||||
"Enable async mode and start specified number of jobs"},
|
||||
#endif
|
||||
OPT_R_OPTIONS,
|
||||
#ifndef OPENSSL_NO_ENGINE
|
||||
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
||||
#endif
|
||||
{"primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)"},
|
||||
|
||||
OPT_SECTION("Selection"),
|
||||
{"evp", OPT_EVP, 's', "Use EVP-named cipher or digest"},
|
||||
{"hmac", OPT_HMAC, 's', "HMAC using EVP-named digest"},
|
||||
#ifndef OPENSSL_NO_CMAC
|
||||
{"cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher"},
|
||||
#endif
|
||||
{"decrypt", OPT_DECRYPT, '-',
|
||||
"Time decryption instead of encryption (only EVP)"},
|
||||
{"aead", OPT_AEAD, '-',
|
||||
"Benchmark EVP-named AEAD cipher in TLS-like sequence"},
|
||||
|
||||
OPT_SECTION("Timing"),
|
||||
{"elapsed", OPT_ELAPSED, '-',
|
||||
"Use wall-clock time instead of CPU user time as divisor"},
|
||||
{"primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)"},
|
||||
{"seconds", OPT_SECONDS, 'p',
|
||||
"Run benchmarks for specified amount of seconds"},
|
||||
{"bytes", OPT_BYTES, 'p',
|
||||
"Run [non-PKI] benchmarks on custom-sized buffer"},
|
||||
{"misalign", OPT_MISALIGN, 'p',
|
||||
"Use specified offset to mis-align buffers"},
|
||||
|
||||
OPT_R_OPTIONS,
|
||||
|
||||
OPT_PARAMETERS(),
|
||||
{"algorithm", 0, 0, "Algorithm(s) to test (optional; otherwise tests all)"},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
#define D_MD2 0
|
||||
#define D_MDC2 1
|
||||
#define D_MD4 2
|
||||
#define D_MD5 3
|
||||
#define D_HMAC 4
|
||||
#define D_SHA1 5
|
||||
#define D_RMD160 6
|
||||
#define D_RC4 7
|
||||
#define D_CBC_DES 8
|
||||
#define D_EDE3_DES 9
|
||||
#define D_CBC_IDEA 10
|
||||
#define D_CBC_SEED 11
|
||||
#define D_CBC_RC2 12
|
||||
#define D_CBC_RC5 13
|
||||
#define D_CBC_BF 14
|
||||
#define D_CBC_CAST 15
|
||||
#define D_CBC_128_AES 16
|
||||
#define D_CBC_192_AES 17
|
||||
#define D_CBC_256_AES 18
|
||||
#define D_CBC_128_CML 19
|
||||
#define D_CBC_192_CML 20
|
||||
#define D_CBC_256_CML 21
|
||||
#define D_EVP 22
|
||||
#define D_SHA256 23
|
||||
#define D_SHA512 24
|
||||
#define D_WHIRLPOOL 25
|
||||
#define D_IGE_128_AES 26
|
||||
#define D_IGE_192_AES 27
|
||||
#define D_IGE_256_AES 28
|
||||
#define D_GHASH 29
|
||||
#define D_RAND 30
|
||||
#define D_EVP_HMAC 31
|
||||
#define D_EVP_CMAC 32
|
||||
|
||||
/* name of algorithms to test */
|
||||
static const char *names[] = {
|
||||
enum {
|
||||
D_MD2, D_MDC2, D_MD4, D_MD5 , D_HMAC, D_SHA1, D_RMD160, D_RC4,
|
||||
D_CBC_DES, D_EDE3_DES, D_CBC_IDEA, D_CBC_SEED,
|
||||
D_CBC_RC2, D_CBC_RC5, D_CBC_BF, D_CBC_CAST,
|
||||
D_CBC_128_AES, D_CBC_192_AES, D_CBC_256_AES,
|
||||
D_CBC_128_CML, D_CBC_192_CML, D_CBC_256_CML,
|
||||
D_EVP, D_SHA256, D_SHA512, D_WHIRLPOOL,
|
||||
D_IGE_128_AES, D_IGE_192_AES, D_IGE_256_AES,
|
||||
D_GHASH, D_RAND, D_EVP_HMAC, D_EVP_CMAC, ALGOR_NUM
|
||||
};
|
||||
/* name of algorithms to test. MUST BE KEEP IN SYNC with above enum ! */
|
||||
static const char *names[ALGOR_NUM] = {
|
||||
"md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4",
|
||||
"des cbc", "des ede3", "idea cbc", "seed cbc",
|
||||
"rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",
|
||||
@@ -398,17 +326,16 @@ static const char *names[] = {
|
||||
"aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash",
|
||||
"rand", "hmac", "cmac"
|
||||
};
|
||||
#define ALGOR_NUM OSSL_NELEM(names)
|
||||
|
||||
/* list of configured algorithm (remaining) */
|
||||
/* list of configured algorithm (remaining), with some few alias */
|
||||
static const OPT_PAIR doit_choices[] = {
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"md2", D_MD2},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MDC2
|
||||
#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"mdc2", D_MDC2},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"md4", D_MD4},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MD5
|
||||
@@ -418,34 +345,34 @@ static const OPT_PAIR doit_choices[] = {
|
||||
{"sha1", D_SHA1},
|
||||
{"sha256", D_SHA256},
|
||||
{"sha512", D_SHA512},
|
||||
#ifndef OPENSSL_NO_WHIRLPOOL
|
||||
#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"whirlpool", D_WHIRLPOOL},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RMD160
|
||||
#if !defined(OPENSSL_NO_RMD160) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"ripemd", D_RMD160},
|
||||
{"rmd160", D_RMD160},
|
||||
{"ripemd160", D_RMD160},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"rc4", D_RC4},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
{"des-cbc", D_CBC_DES},
|
||||
{"des-ede3", D_EDE3_DES},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
{"aes-128-cbc", D_CBC_128_AES},
|
||||
{"aes-192-cbc", D_CBC_192_AES},
|
||||
{"aes-256-cbc", D_CBC_256_AES},
|
||||
#if !OPENSSL_API_3
|
||||
{"aes-128-ige", D_IGE_128_AES},
|
||||
{"aes-192-ige", D_IGE_192_AES},
|
||||
{"aes-256-ige", D_IGE_256_AES},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"rc2-cbc", D_CBC_RC2},
|
||||
{"rc2", D_CBC_RC2},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"rc5-cbc", D_CBC_RC5},
|
||||
{"rc5", D_CBC_RC5},
|
||||
#endif
|
||||
@@ -453,16 +380,16 @@ static const OPT_PAIR doit_choices[] = {
|
||||
{"idea-cbc", D_CBC_IDEA},
|
||||
{"idea", D_CBC_IDEA},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"seed-cbc", D_CBC_SEED},
|
||||
{"seed", D_CBC_SEED},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"bf-cbc", D_CBC_BF},
|
||||
{"blowfish", D_CBC_BF},
|
||||
{"bf", D_CBC_BF},
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
{"cast-cbc", D_CBC_CAST},
|
||||
{"cast", D_CBC_CAST},
|
||||
{"cast5", D_CBC_CAST},
|
||||
@@ -471,31 +398,24 @@ static const OPT_PAIR doit_choices[] = {
|
||||
{"rand", D_RAND}
|
||||
};
|
||||
|
||||
static double results[ALGOR_NUM][OSSL_NELEM(lengths_list)];
|
||||
static double results[ALGOR_NUM][SIZE_NUM];
|
||||
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
# define R_DSA_512 0
|
||||
# define R_DSA_1024 1
|
||||
# define R_DSA_2048 2
|
||||
static const OPT_PAIR dsa_choices[] = {
|
||||
enum { R_DSA_512, R_DSA_1024, R_DSA_2048, DSA_NUM };
|
||||
static const OPT_PAIR dsa_choices[DSA_NUM] = {
|
||||
{"dsa512", R_DSA_512},
|
||||
{"dsa1024", R_DSA_1024},
|
||||
{"dsa2048", R_DSA_2048}
|
||||
};
|
||||
# define DSA_NUM OSSL_NELEM(dsa_choices)
|
||||
|
||||
static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */
|
||||
#endif /* OPENSSL_NO_DSA */
|
||||
|
||||
#define R_RSA_512 0
|
||||
#define R_RSA_1024 1
|
||||
#define R_RSA_2048 2
|
||||
#define R_RSA_3072 3
|
||||
#define R_RSA_4096 4
|
||||
#define R_RSA_7680 5
|
||||
#define R_RSA_15360 6
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
static const OPT_PAIR rsa_choices[] = {
|
||||
enum {
|
||||
R_RSA_512, R_RSA_1024, R_RSA_2048, R_RSA_3072, R_RSA_4096, R_RSA_7680,
|
||||
R_RSA_15360, RSA_NUM
|
||||
};
|
||||
static const OPT_PAIR rsa_choices[RSA_NUM] = {
|
||||
{"rsa512", R_RSA_512},
|
||||
{"rsa1024", R_RSA_1024},
|
||||
{"rsa2048", R_RSA_2048},
|
||||
@@ -504,42 +424,22 @@ static const OPT_PAIR rsa_choices[] = {
|
||||
{"rsa7680", R_RSA_7680},
|
||||
{"rsa15360", R_RSA_15360}
|
||||
};
|
||||
# define RSA_NUM OSSL_NELEM(rsa_choices)
|
||||
|
||||
static double rsa_results[RSA_NUM][2]; /* 2 ops: sign then verify */
|
||||
#endif /* OPENSSL_NO_RSA */
|
||||
|
||||
enum {
|
||||
R_EC_P160,
|
||||
R_EC_P192,
|
||||
R_EC_P224,
|
||||
R_EC_P256,
|
||||
R_EC_P384,
|
||||
R_EC_P521,
|
||||
#ifndef OPENSSL_NO_EC2M
|
||||
R_EC_K163,
|
||||
R_EC_K233,
|
||||
R_EC_K283,
|
||||
R_EC_K409,
|
||||
R_EC_K571,
|
||||
R_EC_B163,
|
||||
R_EC_B233,
|
||||
R_EC_B283,
|
||||
R_EC_B409,
|
||||
R_EC_B571,
|
||||
#endif
|
||||
R_EC_BRP256R1,
|
||||
R_EC_BRP256T1,
|
||||
R_EC_BRP384R1,
|
||||
R_EC_BRP384T1,
|
||||
R_EC_BRP512R1,
|
||||
R_EC_BRP512T1,
|
||||
R_EC_X25519,
|
||||
R_EC_X448
|
||||
};
|
||||
|
||||
#ifndef OPENSSL_NO_EC
|
||||
static OPT_PAIR ecdsa_choices[] = {
|
||||
enum ec_curves_t {
|
||||
R_EC_P160, R_EC_P192, R_EC_P224, R_EC_P256, R_EC_P384, R_EC_P521,
|
||||
# ifndef OPENSSL_NO_EC2M
|
||||
R_EC_K163, R_EC_K233, R_EC_K283, R_EC_K409, R_EC_K571,
|
||||
R_EC_B163, R_EC_B233, R_EC_B283, R_EC_B409, R_EC_B571,
|
||||
# endif
|
||||
R_EC_BRP256R1, R_EC_BRP256T1, R_EC_BRP384R1, R_EC_BRP384T1,
|
||||
R_EC_BRP512R1, R_EC_BRP512T1, ECDSA_NUM
|
||||
};
|
||||
/* list of ecdsa curves */
|
||||
static const OPT_PAIR ecdsa_choices[ECDSA_NUM] = {
|
||||
{"ecdsap160", R_EC_P160},
|
||||
{"ecdsap192", R_EC_P192},
|
||||
{"ecdsap224", R_EC_P224},
|
||||
@@ -565,11 +465,9 @@ static OPT_PAIR ecdsa_choices[] = {
|
||||
{"ecdsabrp512r1", R_EC_BRP512R1},
|
||||
{"ecdsabrp512t1", R_EC_BRP512T1}
|
||||
};
|
||||
# define ECDSA_NUM OSSL_NELEM(ecdsa_choices)
|
||||
|
||||
static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
|
||||
|
||||
static const OPT_PAIR ecdh_choices[] = {
|
||||
enum { R_EC_X25519 = ECDSA_NUM, R_EC_X448, EC_NUM };
|
||||
/* list of ecdh curves, extension of |ecdsa_choices| list above */
|
||||
static const OPT_PAIR ecdh_choices[EC_NUM] = {
|
||||
{"ecdhp160", R_EC_P160},
|
||||
{"ecdhp192", R_EC_P192},
|
||||
{"ecdhp224", R_EC_P224},
|
||||
@@ -597,29 +495,25 @@ static const OPT_PAIR ecdh_choices[] = {
|
||||
{"ecdhx25519", R_EC_X25519},
|
||||
{"ecdhx448", R_EC_X448}
|
||||
};
|
||||
# define EC_NUM OSSL_NELEM(ecdh_choices)
|
||||
|
||||
static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */
|
||||
static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */
|
||||
static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
|
||||
|
||||
#define R_EC_Ed25519 0
|
||||
#define R_EC_Ed448 1
|
||||
static OPT_PAIR eddsa_choices[] = {
|
||||
enum { R_EC_Ed25519, R_EC_Ed448, EdDSA_NUM };
|
||||
static const OPT_PAIR eddsa_choices[EdDSA_NUM] = {
|
||||
{"ed25519", R_EC_Ed25519},
|
||||
{"ed448", R_EC_Ed448}
|
||||
};
|
||||
# define EdDSA_NUM OSSL_NELEM(eddsa_choices)
|
||||
|
||||
};
|
||||
static double eddsa_results[EdDSA_NUM][2]; /* 2 ops: sign then verify */
|
||||
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
# define R_EC_CURVESM2 0
|
||||
static OPT_PAIR sm2_choices[] = {
|
||||
enum { R_EC_CURVESM2, SM2_NUM };
|
||||
static const OPT_PAIR sm2_choices[SM2_NUM] = {
|
||||
{"curveSM2", R_EC_CURVESM2}
|
||||
};
|
||||
# define SM2_ID "TLSv1.3+GM+Cipher+Suite"
|
||||
# define SM2_ID_LEN sizeof("TLSv1.3+GM+Cipher+Suite") - 1
|
||||
# define SM2_NUM OSSL_NELEM(sm2_choices)
|
||||
|
||||
static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */
|
||||
# endif /* OPENSSL_NO_SM2 */
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
@@ -674,9 +568,9 @@ static int run_benchmark(int async_jobs, int (*loop_function) (void *),
|
||||
static unsigned int testnum;
|
||||
|
||||
/* Nb of iterations to do per algorithm and key-size */
|
||||
static long c[ALGOR_NUM][OSSL_NELEM(lengths_list)];
|
||||
static long c[ALGOR_NUM][SIZE_NUM];
|
||||
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static int EVP_Digest_MD2_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -693,7 +587,7 @@ static int EVP_Digest_MD2_loop(void *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_MDC2
|
||||
#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static int EVP_Digest_MDC2_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -710,7 +604,7 @@ static int EVP_Digest_MDC2_loop(void *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static int EVP_Digest_MD4_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -789,7 +683,7 @@ static int SHA512_loop(void *args)
|
||||
return count;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_WHIRLPOOL
|
||||
#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static int WHIRLPOOL_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -802,7 +696,7 @@ static int WHIRLPOOL_loop(void *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_RMD160
|
||||
#if !defined(OPENSSL_NO_RMD160) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static int EVP_Digest_RMD160_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -818,7 +712,7 @@ static int EVP_Digest_RMD160_loop(void *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
static RC4_KEY rc4_ks;
|
||||
static int RC4_loop(void *args)
|
||||
{
|
||||
@@ -833,16 +727,14 @@ static int RC4_loop(void *args)
|
||||
|
||||
#ifndef OPENSSL_NO_DES
|
||||
static unsigned char DES_iv[8];
|
||||
static DES_key_schedule sch;
|
||||
static DES_key_schedule sch2;
|
||||
static DES_key_schedule sch3;
|
||||
static DES_key_schedule sch[3];
|
||||
static int DES_ncbc_encrypt_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
unsigned char *buf = tempargs->buf;
|
||||
int count;
|
||||
for (count = 0; COND(c[D_CBC_DES][testnum]); count++)
|
||||
DES_ncbc_encrypt(buf, buf, lengths[testnum], &sch,
|
||||
DES_ncbc_encrypt(buf, buf, lengths[testnum], &sch[0],
|
||||
&DES_iv, DES_ENCRYPT);
|
||||
return count;
|
||||
}
|
||||
@@ -854,7 +746,7 @@ static int DES_ede3_cbc_encrypt_loop(void *args)
|
||||
int count;
|
||||
for (count = 0; COND(c[D_EDE3_DES][testnum]); count++)
|
||||
DES_ede3_cbc_encrypt(buf, buf, lengths[testnum],
|
||||
&sch, &sch2, &sch3, &DES_iv, DES_ENCRYPT);
|
||||
&sch[0], &sch[1], &sch[2], &DES_iv, DES_ENCRYPT);
|
||||
return count;
|
||||
}
|
||||
#endif
|
||||
@@ -862,6 +754,8 @@ static int DES_ede3_cbc_encrypt_loop(void *args)
|
||||
#define MAX_BLOCK_SIZE 128
|
||||
|
||||
static unsigned char iv[2 * MAX_BLOCK_SIZE / 8];
|
||||
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
static AES_KEY aes_ks1, aes_ks2, aes_ks3;
|
||||
static int AES_cbc_128_encrypt_loop(void *args)
|
||||
{
|
||||
@@ -896,7 +790,6 @@ static int AES_cbc_256_encrypt_loop(void *args)
|
||||
return count;
|
||||
}
|
||||
|
||||
#if !OPENSSL_API_3
|
||||
static int AES_ige_128_encrypt_loop(void *args)
|
||||
{
|
||||
loopargs_t *tempargs = *(loopargs_t **) args;
|
||||
@@ -932,7 +825,6 @@ static int AES_ige_256_encrypt_loop(void *args)
|
||||
(size_t)lengths[testnum], &aes_ks3, iv, AES_ENCRYPT);
|
||||
return count;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int CRYPTO_gcm128_aad_loop(void *args)
|
||||
{
|
||||
@@ -944,6 +836,7 @@ static int CRYPTO_gcm128_aad_loop(void *args)
|
||||
CRYPTO_gcm128_aad(gcm_ctx, buf, lengths[testnum]);
|
||||
return count;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int RAND_bytes_loop(void *args)
|
||||
{
|
||||
@@ -956,7 +849,6 @@ static int RAND_bytes_loop(void *args)
|
||||
return count;
|
||||
}
|
||||
|
||||
static long save_count = 0;
|
||||
static int decrypt = 0;
|
||||
static int EVP_Update_loop(void *args)
|
||||
{
|
||||
@@ -964,11 +856,9 @@ static int EVP_Update_loop(void *args)
|
||||
unsigned char *buf = tempargs->buf;
|
||||
EVP_CIPHER_CTX *ctx = tempargs->ctx;
|
||||
int outl, count, rc;
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
if (decrypt) {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
rc = EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]);
|
||||
if (rc != 1) {
|
||||
/* reset iv in case of counter overflow */
|
||||
@@ -976,7 +866,7 @@ static int EVP_Update_loop(void *args)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
rc = EVP_EncryptUpdate(ctx, buf, &outl, buf, lengths[testnum]);
|
||||
if (rc != 1) {
|
||||
/* reset iv in case of counter overflow */
|
||||
@@ -1003,11 +893,9 @@ static int EVP_Update_loop_ccm(void *args)
|
||||
EVP_CIPHER_CTX *ctx = tempargs->ctx;
|
||||
int outl, count;
|
||||
unsigned char tag[12];
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
if (decrypt) {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(tag), tag);
|
||||
/* reset iv */
|
||||
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv);
|
||||
@@ -1015,7 +903,7 @@ static int EVP_Update_loop_ccm(void *args)
|
||||
EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]);
|
||||
}
|
||||
} else {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
/* restore iv length field */
|
||||
EVP_EncryptUpdate(ctx, NULL, &outl, NULL, lengths[testnum]);
|
||||
/* counter is reset on every update */
|
||||
@@ -1042,11 +930,9 @@ static int EVP_Update_loop_aead(void *args)
|
||||
int outl, count;
|
||||
unsigned char aad[13] = { 0xcc };
|
||||
unsigned char faketag[16] = { 0xcc };
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
if (decrypt) {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv);
|
||||
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
|
||||
sizeof(faketag), faketag);
|
||||
@@ -1055,7 +941,7 @@ static int EVP_Update_loop_aead(void *args)
|
||||
EVP_DecryptFinal_ex(ctx, buf + outl, &outl);
|
||||
}
|
||||
} else {
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv);
|
||||
EVP_EncryptUpdate(ctx, NULL, &outl, aad, sizeof(aad));
|
||||
EVP_EncryptUpdate(ctx, buf, &outl, buf, lengths[testnum]);
|
||||
@@ -1072,11 +958,8 @@ static int EVP_Digest_loop(void *args)
|
||||
unsigned char *buf = tempargs->buf;
|
||||
unsigned char md[EVP_MAX_MD_SIZE];
|
||||
int count;
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP][testnum]); count++) {
|
||||
if (!EVP_Digest(buf, lengths[testnum], md, NULL, evp_md, NULL))
|
||||
return -1;
|
||||
}
|
||||
@@ -1091,11 +974,8 @@ static int EVP_HMAC_loop(void *args)
|
||||
unsigned char *buf = tempargs->buf;
|
||||
unsigned char no_key[32];
|
||||
int count;
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP_HMAC][testnum]); count++) {
|
||||
if (HMAC(evp_hmac_md, no_key, sizeof(no_key), buf, lengths[testnum],
|
||||
NULL, NULL) == NULL)
|
||||
return -1;
|
||||
@@ -1116,11 +996,8 @@ static int EVP_CMAC_loop(void *args)
|
||||
unsigned char mac[16];
|
||||
size_t len = sizeof(mac);
|
||||
int count;
|
||||
#ifndef SIGALRM
|
||||
int nb_iter = save_count * 4 * lengths[0] / lengths[testnum];
|
||||
#endif
|
||||
|
||||
for (count = 0; COND(nb_iter); count++) {
|
||||
for (count = 0; COND(c[D_EVP_CMAC][testnum]); count++) {
|
||||
if (!CMAC_Init(cmac_ctx, key, sizeof(key), evp_cmac_cipher, NULL)
|
||||
|| !CMAC_Update(cmac_ctx, buf, lengths[testnum])
|
||||
|| !CMAC_Final(cmac_ctx, mac, &len))
|
||||
@@ -1399,8 +1276,6 @@ static int run_benchmark(int async_jobs,
|
||||
OSSL_ASYNC_FD job_fd = 0;
|
||||
size_t num_job_fds = 0;
|
||||
|
||||
run = 1;
|
||||
|
||||
if (async_jobs == 0) {
|
||||
return loop_function((void *)&loopargs);
|
||||
}
|
||||
@@ -1542,6 +1417,9 @@ static int run_benchmark(int async_jobs,
|
||||
return error ? -1 : total_op_count;
|
||||
}
|
||||
|
||||
#define stop_it(do_it, test_num)\
|
||||
memset(do_it + test_num, 0, OSSL_NELEM(do_it) - test_num);
|
||||
|
||||
int speed_main(int argc, char **argv)
|
||||
{
|
||||
ENGINE *e = NULL;
|
||||
@@ -1552,11 +1430,11 @@ int speed_main(int argc, char **argv)
|
||||
double d = 0.0;
|
||||
OPTION_CHOICE o;
|
||||
int async_init = 0, multiblock = 0, pr_header = 0;
|
||||
int doit[ALGOR_NUM] = { 0 };
|
||||
uint8_t doit[ALGOR_NUM] = { 0 };
|
||||
int ret = 1, misalign = 0, lengths_single = 0, aead = 0;
|
||||
long count = 0;
|
||||
unsigned int size_num = OSSL_NELEM(lengths_list);
|
||||
unsigned int i, k, loop, loopargs_len = 0, async_jobs = 0;
|
||||
unsigned int size_num = SIZE_NUM;
|
||||
unsigned int i, k, loopargs_len = 0, async_jobs = 0;
|
||||
int keylen;
|
||||
int buflen;
|
||||
#ifndef NO_FORK
|
||||
@@ -1571,28 +1449,29 @@ int speed_main(int argc, char **argv)
|
||||
EdDSA_SECONDS, SM2_SECONDS };
|
||||
|
||||
/* What follows are the buffers and key material. */
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
RC5_32_KEY rc5_ks;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
RC2_KEY rc2_ks;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
IDEA_KEY_SCHEDULE idea_ks;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
SEED_KEY_SCHEDULE seed_ks;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
BF_KEY bf_ks;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
CAST_KEY cast_ks;
|
||||
#endif
|
||||
static const unsigned char key16[16] = {
|
||||
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
|
||||
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12
|
||||
};
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
static const unsigned char key24[24] = {
|
||||
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
|
||||
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
|
||||
@@ -1604,62 +1483,45 @@ int speed_main(int argc, char **argv)
|
||||
0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
|
||||
0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56
|
||||
};
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
static const unsigned char ckey24[24] = {
|
||||
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
|
||||
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
|
||||
0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34
|
||||
};
|
||||
static const unsigned char ckey32[32] = {
|
||||
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
|
||||
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
|
||||
0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,
|
||||
0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56
|
||||
};
|
||||
CAMELLIA_KEY camellia_ks1, camellia_ks2, camellia_ks3;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
static DES_cblock key = {
|
||||
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0
|
||||
};
|
||||
static DES_cblock key2 = {
|
||||
0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12
|
||||
};
|
||||
static DES_cblock key3 = {
|
||||
0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34
|
||||
};
|
||||
#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
CAMELLIA_KEY camellia_ks[3];
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
static const unsigned int rsa_bits[RSA_NUM] = {
|
||||
512, 1024, 2048, 3072, 4096, 7680, 15360
|
||||
static const struct {
|
||||
const unsigned char *data;
|
||||
unsigned int length;
|
||||
unsigned int bits;
|
||||
} rsa_keys[] = {
|
||||
{ test512, sizeof(test512), 512 },
|
||||
{ test1024, sizeof(test1024), 1024 },
|
||||
{ test2048, sizeof(test2048), 2048 },
|
||||
{ test3072, sizeof(test3072), 3072 },
|
||||
{ test4096, sizeof(test4096), 4092 },
|
||||
{ test7680, sizeof(test7680), 7680 },
|
||||
{ test15360, sizeof(test15360), 15360 }
|
||||
};
|
||||
static const unsigned char *rsa_data[RSA_NUM] = {
|
||||
test512, test1024, test2048, test3072, test4096, test7680, test15360
|
||||
};
|
||||
static const int rsa_data_length[RSA_NUM] = {
|
||||
sizeof(test512), sizeof(test1024),
|
||||
sizeof(test2048), sizeof(test3072),
|
||||
sizeof(test4096), sizeof(test7680),
|
||||
sizeof(test15360)
|
||||
};
|
||||
int rsa_doit[RSA_NUM] = { 0 };
|
||||
uint8_t rsa_doit[RSA_NUM] = { 0 };
|
||||
int primes = RSA_DEFAULT_PRIME_NUM;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
static const unsigned int dsa_bits[DSA_NUM] = { 512, 1024, 2048 };
|
||||
int dsa_doit[DSA_NUM] = { 0 };
|
||||
uint8_t dsa_doit[DSA_NUM] = { 0 };
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
/*
|
||||
* We only test over the following curves as they are representative, To
|
||||
* add tests over more curves, simply add the curve NID and curve name to
|
||||
* the following arrays and increase the |ecdh_choices| list accordingly.
|
||||
*/
|
||||
static const struct {
|
||||
typedef struct ec_curve_st {
|
||||
const char *name;
|
||||
unsigned int nid;
|
||||
unsigned int bits;
|
||||
} test_curves[] = {
|
||||
size_t sigsize; /* only used for EdDSA curves */
|
||||
} EC_CURVE;
|
||||
/*
|
||||
* We only test over the following curves as they are representative, To
|
||||
* add tests over more curves, simply add the curve NID and curve name to
|
||||
* the following arrays and increase the |ecdh_choices| and |ecdsa_choices|
|
||||
* lists accordingly.
|
||||
*/
|
||||
static const EC_CURVE ec_curves[EC_NUM] = {
|
||||
/* Prime Curves */
|
||||
{"secp160r1", NID_secp160r1, 160},
|
||||
{"nistp192", NID_X9_62_prime192v1, 192},
|
||||
@@ -1690,33 +1552,36 @@ int speed_main(int argc, char **argv)
|
||||
{"X25519", NID_X25519, 253},
|
||||
{"X448", NID_X448, 448}
|
||||
};
|
||||
static const struct {
|
||||
const char *name;
|
||||
unsigned int nid;
|
||||
unsigned int bits;
|
||||
size_t sigsize;
|
||||
} test_ed_curves[] = {
|
||||
static const EC_CURVE ed_curves[EdDSA_NUM] = {
|
||||
/* EdDSA */
|
||||
{"Ed25519", NID_ED25519, 253, 64},
|
||||
{"Ed448", NID_ED448, 456, 114}
|
||||
};
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
static const struct {
|
||||
const char *name;
|
||||
unsigned int nid;
|
||||
unsigned int bits;
|
||||
} test_sm2_curves[] = {
|
||||
static const EC_CURVE sm2_curves[SM2_NUM] = {
|
||||
/* SM2 */
|
||||
{"CurveSM2", NID_sm2, 256}
|
||||
};
|
||||
uint8_t sm2_doit[SM2_NUM] = { 0 };
|
||||
# endif
|
||||
uint8_t ecdsa_doit[ECDSA_NUM] = { 0 };
|
||||
uint8_t ecdh_doit[EC_NUM] = { 0 };
|
||||
uint8_t eddsa_doit[EdDSA_NUM] = { 0 };
|
||||
|
||||
/* checks declarated curves against choices list. */
|
||||
OPENSSL_assert(ed_curves[EdDSA_NUM - 1].nid == NID_ED448);
|
||||
OPENSSL_assert(strcmp(eddsa_choices[EdDSA_NUM - 1].name, "ed448") == 0);
|
||||
|
||||
OPENSSL_assert(ec_curves[EC_NUM - 1].nid == NID_X448);
|
||||
OPENSSL_assert(strcmp(ecdh_choices[EC_NUM - 1].name, "ecdhx448") == 0);
|
||||
|
||||
OPENSSL_assert(ec_curves[ECDSA_NUM - 1].nid == NID_brainpoolP512t1);
|
||||
OPENSSL_assert(strcmp(ecdsa_choices[ECDSA_NUM - 1].name, "ecdsabrp512t1") == 0);
|
||||
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
OPENSSL_assert(sm2_curves[SM2_NUM - 1].nid == NID_sm2);
|
||||
OPENSSL_assert(strcmp(sm2_choices[SM2_NUM - 1].name, "curveSM2") == 0);
|
||||
# endif
|
||||
int ecdsa_doit[ECDSA_NUM] = { 0 };
|
||||
int ecdh_doit[EC_NUM] = { 0 };
|
||||
int eddsa_doit[EdDSA_NUM] = { 0 };
|
||||
int sm2_doit[SM2_NUM] = { 0 };
|
||||
OPENSSL_assert(OSSL_NELEM(test_curves) >= EC_NUM);
|
||||
OPENSSL_assert(OSSL_NELEM(test_ed_curves) >= EdDSA_NUM);
|
||||
OPENSSL_assert(OSSL_NELEM(test_sm2_curves) >= SM2_NUM);
|
||||
#endif /* ndef OPENSSL_NO_EC */
|
||||
|
||||
prog = opt_init(argc, argv, speed_options);
|
||||
@@ -1847,95 +1712,101 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
/* Remaining arguments are algorithms. */
|
||||
for (; *argv; argv++) {
|
||||
if (found(*argv, doit_choices, &i)) {
|
||||
const char *algo = *argv;
|
||||
|
||||
if (opt_found(algo, doit_choices, &i)) {
|
||||
doit[i] = 1;
|
||||
continue;
|
||||
}
|
||||
#ifndef OPENSSL_NO_DES
|
||||
if (strcmp(*argv, "des") == 0) {
|
||||
if (strcmp(algo, "des") == 0) {
|
||||
doit[D_CBC_DES] = doit[D_EDE3_DES] = 1;
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
if (strcmp(*argv, "sha") == 0) {
|
||||
if (strcmp(algo, "sha") == 0) {
|
||||
doit[D_SHA1] = doit[D_SHA256] = doit[D_SHA512] = 1;
|
||||
continue;
|
||||
}
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
if (strcmp(*argv, "openssl") == 0)
|
||||
continue;
|
||||
if (strcmp(*argv, "rsa") == 0) {
|
||||
for (loop = 0; loop < OSSL_NELEM(rsa_doit); loop++)
|
||||
rsa_doit[loop] = 1;
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, rsa_choices, &i)) {
|
||||
rsa_doit[i] = 1;
|
||||
if (strcmp(algo, "openssl") == 0) /* just for compatibility */
|
||||
continue;
|
||||
if (strncmp(algo, "rsa", 3) == 0) {
|
||||
if (algo[3] == '\0') {
|
||||
memset(rsa_doit, 1, sizeof(rsa_doit));
|
||||
continue;
|
||||
}
|
||||
if (opt_found(algo, rsa_choices, &i)) {
|
||||
rsa_doit[i] = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
if (strcmp(*argv, "dsa") == 0) {
|
||||
dsa_doit[R_DSA_512] = dsa_doit[R_DSA_1024] =
|
||||
dsa_doit[R_DSA_2048] = 1;
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, dsa_choices, &i)) {
|
||||
dsa_doit[i] = 2;
|
||||
continue;
|
||||
if (strncmp(algo, "dsa", 3) == 0) {
|
||||
if (algo[3] == '\0') {
|
||||
memset(dsa_doit, 1, sizeof(dsa_doit));
|
||||
continue;
|
||||
}
|
||||
if (opt_found(algo, dsa_choices, &i)) {
|
||||
dsa_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (strcmp(*argv, "aes") == 0) {
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
if (strcmp(algo, "aes") == 0) {
|
||||
doit[D_CBC_128_AES] = doit[D_CBC_192_AES] = doit[D_CBC_256_AES] = 1;
|
||||
continue;
|
||||
}
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
if (strcmp(*argv, "camellia") == 0) {
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (strcmp(algo, "camellia") == 0) {
|
||||
doit[D_CBC_128_CML] = doit[D_CBC_192_CML] = doit[D_CBC_256_CML] = 1;
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
if (strcmp(*argv, "ecdsa") == 0) {
|
||||
for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++)
|
||||
ecdsa_doit[loop] = 1;
|
||||
if (strncmp(algo, "ecdsa", 5) == 0) {
|
||||
if (algo[5] == '\0') {
|
||||
memset(ecdsa_doit, 1, sizeof(ecdsa_doit));
|
||||
continue;
|
||||
}
|
||||
if (opt_found(algo, ecdsa_choices, &i)) {
|
||||
ecdsa_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (strncmp(algo, "ecdh", 4) == 0) {
|
||||
if (algo[4] == '\0') {
|
||||
memset(ecdh_doit, 1, sizeof(ecdh_doit));
|
||||
continue;
|
||||
}
|
||||
if (opt_found(algo, ecdh_choices, &i)) {
|
||||
ecdh_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (strcmp(algo, "eddsa") == 0) {
|
||||
memset(eddsa_doit, 1, sizeof(eddsa_doit));
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, ecdsa_choices, &i)) {
|
||||
ecdsa_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
if (strcmp(*argv, "ecdh") == 0) {
|
||||
for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++)
|
||||
ecdh_doit[loop] = 1;
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, ecdh_choices, &i)) {
|
||||
ecdh_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
if (strcmp(*argv, "eddsa") == 0) {
|
||||
for (loop = 0; loop < OSSL_NELEM(eddsa_doit); loop++)
|
||||
eddsa_doit[loop] = 1;
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, eddsa_choices, &i)) {
|
||||
if (opt_found(algo, eddsa_choices, &i)) {
|
||||
eddsa_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
if (strcmp(*argv, "sm2") == 0) {
|
||||
for (loop = 0; loop < OSSL_NELEM(sm2_doit); loop++)
|
||||
sm2_doit[loop] = 1;
|
||||
if (strcmp(algo, "sm2") == 0) {
|
||||
memset(sm2_doit, 1, sizeof(sm2_doit));
|
||||
continue;
|
||||
}
|
||||
if (found(*argv, sm2_choices, &i)) {
|
||||
if (opt_found(algo, sm2_choices, &i)) {
|
||||
sm2_doit[i] = 2;
|
||||
continue;
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
BIO_printf(bio_err, "%s: Unknown algorithm %s\n", prog, *argv);
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
BIO_printf(bio_err, "%s: Unknown algorithm %s\n", prog, algo);
|
||||
goto end;
|
||||
}
|
||||
|
||||
@@ -2018,27 +1889,20 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
/* No parameters; turn on everything. */
|
||||
if (argc == 0 && !doit[D_EVP] && !doit[D_EVP_HMAC] && !doit[D_EVP_CMAC]) {
|
||||
for (i = 0; i < ALGOR_NUM; i++)
|
||||
if (i != D_EVP && i != D_EVP_HMAC && i != D_EVP_CMAC)
|
||||
doit[i] = 1;
|
||||
memset(doit, 1, sizeof(doit));
|
||||
doit[D_EVP] = doit[D_EVP_HMAC] = doit[D_EVP_CMAC] = 0;
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
for (i = 0; i < RSA_NUM; i++)
|
||||
rsa_doit[i] = 1;
|
||||
memset(rsa_doit, 1, sizeof(rsa_doit));
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DSA
|
||||
for (i = 0; i < DSA_NUM; i++)
|
||||
dsa_doit[i] = 1;
|
||||
memset(dsa_doit, 1, sizeof(dsa_doit));
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC
|
||||
for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++)
|
||||
ecdsa_doit[loop] = 1;
|
||||
for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++)
|
||||
ecdh_doit[loop] = 1;
|
||||
for (loop = 0; loop < OSSL_NELEM(eddsa_doit); loop++)
|
||||
eddsa_doit[loop] = 1;
|
||||
memset(ecdsa_doit, 1, sizeof(ecdsa_doit));
|
||||
memset(ecdh_doit, 1, sizeof(ecdh_doit));
|
||||
memset(eddsa_doit, 1, sizeof(eddsa_doit));
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
for (loop = 0; loop < OSSL_NELEM(sm2_doit); loop++)
|
||||
sm2_doit[loop] = 1;
|
||||
memset(sm2_doit, 1, sizeof(sm2_doit));
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
@@ -2058,11 +1922,10 @@ int speed_main(int argc, char **argv)
|
||||
break;
|
||||
}
|
||||
for (k = 0; k < RSA_NUM; k++) {
|
||||
const unsigned char *p;
|
||||
const unsigned char *p = rsa_keys[k].data;
|
||||
|
||||
p = rsa_data[k];
|
||||
loopargs[i].rsa_key[k] =
|
||||
d2i_RSAPrivateKey(NULL, &p, rsa_data_length[k]);
|
||||
d2i_RSAPrivateKey(NULL, &p, rsa_keys[k].length);
|
||||
if (loopargs[i].rsa_key[k] == NULL) {
|
||||
BIO_printf(bio_err,
|
||||
"internal error loading RSA key number %d\n", k);
|
||||
@@ -2079,41 +1942,59 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
DES_set_key_unchecked(&key, &sch);
|
||||
DES_set_key_unchecked(&key2, &sch2);
|
||||
DES_set_key_unchecked(&key3, &sch3);
|
||||
if (doit[D_CBC_DES] || doit[D_EDE3_DES]) {
|
||||
static DES_cblock keys[] = {
|
||||
{ 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 }, /* keys[0] */
|
||||
{ 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12 }, /* keys[1] */
|
||||
{ 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34 } /* keys[3] */
|
||||
};
|
||||
DES_set_key_unchecked(&keys[0], &sch[0]);
|
||||
DES_set_key_unchecked(&keys[1], &sch[1]);
|
||||
DES_set_key_unchecked(&keys[2], &sch[2]);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
AES_set_encrypt_key(key16, 128, &aes_ks1);
|
||||
AES_set_encrypt_key(key24, 192, &aes_ks2);
|
||||
AES_set_encrypt_key(key32, 256, &aes_ks3);
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
Camellia_set_key(key16, 128, &camellia_ks1);
|
||||
Camellia_set_key(ckey24, 192, &camellia_ks2);
|
||||
Camellia_set_key(ckey32, 256, &camellia_ks3);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
IDEA_set_encrypt_key(key16, &idea_ks);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
SEED_set_key(key16, &seed_ks);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
RC4_set_key(&rc4_ks, 16, key16);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
RC2_set_key(&rc2_ks, 16, key16, 128);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
if (!RC5_32_set_key(&rc5_ks, 16, key16, 12)) {
|
||||
BIO_printf(bio_err, "Failed setting RC5 key\n");
|
||||
goto end;
|
||||
#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_128_CML] || doit[D_CBC_192_CML] || doit[D_CBC_256_CML]) {
|
||||
Camellia_set_key(key16, 128, &camellia_ks[0]);
|
||||
Camellia_set_key(key24, 192, &camellia_ks[1]);
|
||||
Camellia_set_key(key32, 256, &camellia_ks[2]);
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
BF_set_key(&bf_ks, 16, key16);
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
if (doit[D_CBC_IDEA])
|
||||
IDEA_set_encrypt_key(key16, &idea_ks);
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
CAST_set_key(&cast_ks, 16, key16);
|
||||
#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_SEED])
|
||||
SEED_set_key(key16, &seed_ks);
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_RC4])
|
||||
RC4_set_key(&rc4_ks, 16, key16);
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_RC2])
|
||||
RC2_set_key(&rc2_ks, 16, key16, 128);
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_RC5])
|
||||
if (!RC5_32_set_key(&rc5_ks, 16, key16, 12)) {
|
||||
BIO_printf(bio_err, "Failed setting RC5 key\n");
|
||||
goto end;
|
||||
}
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_BF])
|
||||
BF_set_key(&bf_ks, 16, key16);
|
||||
#endif
|
||||
#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_CAST])
|
||||
CAST_set_key(&cast_ks, 16, key16);
|
||||
#endif
|
||||
#ifndef SIGALRM
|
||||
# ifndef OPENSSL_NO_DES
|
||||
@@ -2128,7 +2009,6 @@ int speed_main(int argc, char **argv)
|
||||
(DES_cblock *)loopargs[0].buf, &sch, DES_ENCRYPT);
|
||||
d = Time_F(STOP);
|
||||
} while (d < 3);
|
||||
save_count = count;
|
||||
c[D_MD2][0] = count / 10;
|
||||
c[D_MDC2][0] = count / 10;
|
||||
c[D_MD4][0] = count;
|
||||
@@ -2151,6 +2031,7 @@ int speed_main(int argc, char **argv)
|
||||
c[D_CBC_128_CML][0] = count;
|
||||
c[D_CBC_192_CML][0] = count;
|
||||
c[D_CBC_256_CML][0] = count;
|
||||
c[D_EVP][0] = count;
|
||||
c[D_SHA256][0] = count;
|
||||
c[D_SHA512][0] = count;
|
||||
c[D_WHIRLPOOL][0] = count;
|
||||
@@ -2159,12 +2040,12 @@ int speed_main(int argc, char **argv)
|
||||
c[D_IGE_256_AES][0] = count;
|
||||
c[D_GHASH][0] = count;
|
||||
c[D_RAND][0] = count;
|
||||
c[D_EVP_HMAC][0] = count;
|
||||
c[D_EVP_CMAC][0] = count;
|
||||
|
||||
for (i = 1; i < size_num; i++) {
|
||||
long l0, l1;
|
||||
|
||||
l0 = (long)lengths[0];
|
||||
l1 = (long)lengths[i];
|
||||
long l0 = (long)lengths[0];
|
||||
long l1 = (long)lengths[i];
|
||||
|
||||
c[D_MD2][i] = c[D_MD2][0] * 4 * l0 / l1;
|
||||
c[D_MDC2][i] = c[D_MDC2][0] * 4 * l0 / l1;
|
||||
@@ -2173,11 +2054,14 @@ int speed_main(int argc, char **argv)
|
||||
c[D_HMAC][i] = c[D_HMAC][0] * 4 * l0 / l1;
|
||||
c[D_SHA1][i] = c[D_SHA1][0] * 4 * l0 / l1;
|
||||
c[D_RMD160][i] = c[D_RMD160][0] * 4 * l0 / l1;
|
||||
c[D_EVP][i] = = c[D_EVP][0] * 4 * l0 / l1;
|
||||
c[D_SHA256][i] = c[D_SHA256][0] * 4 * l0 / l1;
|
||||
c[D_SHA512][i] = c[D_SHA512][0] * 4 * l0 / l1;
|
||||
c[D_WHIRLPOOL][i] = c[D_WHIRLPOOL][0] * 4 * l0 / l1;
|
||||
c[D_GHASH][i] = c[D_GHASH][0] * 4 * l0 / l1;
|
||||
c[D_RAND][i] = c[D_RAND][0] * 4 * l0 / l1;
|
||||
c[D_EVP_HMAC][i] = = c[D_EVP_HMAC][0] * 4 * l0 / l1;
|
||||
c[D_EVP_CMAC][i] = = c[D_EVP_CMAC][0] * 4 * l0 / l1;
|
||||
|
||||
l0 = (long)lengths[i - 1];
|
||||
|
||||
@@ -2349,7 +2233,7 @@ int speed_main(int argc, char **argv)
|
||||
# ifndef OPENSSL_NO_SM2
|
||||
sm2_c[R_EC_SM2P256][0] = count / 1800;
|
||||
# endif
|
||||
# endif
|
||||
# endif /* OPENSSL_NO_EC */
|
||||
|
||||
# else
|
||||
/* not worth fixing */
|
||||
@@ -2359,7 +2243,7 @@ int speed_main(int argc, char **argv)
|
||||
signal(SIGALRM, alarmed);
|
||||
#endif /* SIGALRM */
|
||||
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_MD2]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_MD2], c[D_MD2][testnum], lengths[testnum],
|
||||
@@ -2371,7 +2255,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_MDC2
|
||||
#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_MDC2]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_MDC2], c[D_MDC2][testnum], lengths[testnum],
|
||||
@@ -2380,11 +2264,13 @@ int speed_main(int argc, char **argv)
|
||||
count = run_benchmark(async_jobs, EVP_Digest_MDC2_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_MDC2, testnum, count, d);
|
||||
if (count < 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_MD4
|
||||
#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_MD4]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_MD4], c[D_MD4][testnum], lengths[testnum],
|
||||
@@ -2393,6 +2279,8 @@ int speed_main(int argc, char **argv)
|
||||
count = run_benchmark(async_jobs, EVP_Digest_MD4_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_MD4, testnum, count, d);
|
||||
if (count < 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -2430,9 +2318,8 @@ int speed_main(int argc, char **argv)
|
||||
d = Time_F(STOP);
|
||||
print_result(D_HMAC, testnum, count, d);
|
||||
}
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
for (i = 0; i < loopargs_len; i++)
|
||||
HMAC_CTX_free(loopargs[i].hctx);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (doit[D_SHA1]) {
|
||||
@@ -2465,7 +2352,7 @@ int speed_main(int argc, char **argv)
|
||||
print_result(D_SHA512, testnum, count, d);
|
||||
}
|
||||
}
|
||||
#ifndef OPENSSL_NO_WHIRLPOOL
|
||||
#if !defined(OPENSSL_NO_WHIRLPOOL) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_WHIRLPOOL]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_WHIRLPOOL], c[D_WHIRLPOOL][testnum],
|
||||
@@ -2478,7 +2365,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_RMD160
|
||||
#if !defined(OPENSSL_NO_RMD160) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_RMD160]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_RMD160], c[D_RMD160][testnum],
|
||||
@@ -2487,10 +2374,12 @@ int speed_main(int argc, char **argv)
|
||||
count = run_benchmark(async_jobs, EVP_Digest_RMD160_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_RMD160, testnum, count, d);
|
||||
if (count < 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_RC4]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_RC4], c[D_RC4][testnum], lengths[testnum],
|
||||
@@ -2527,6 +2416,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
if (doit[D_CBC_128_AES]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_CBC_128_AES], c[D_CBC_128_AES][testnum],
|
||||
@@ -2561,7 +2451,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
#if !OPENSSL_API_3
|
||||
|
||||
if (doit[D_IGE_128_AES]) {
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_IGE_128_AES], c[D_IGE_128_AES][testnum],
|
||||
@@ -2595,7 +2485,6 @@ int speed_main(int argc, char **argv)
|
||||
print_result(D_IGE_256_AES, testnum, count, d);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (doit[D_GHASH]) {
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
loopargs[i].gcm_ctx =
|
||||
@@ -2615,7 +2504,8 @@ int speed_main(int argc, char **argv)
|
||||
for (i = 0; i < loopargs_len; i++)
|
||||
CRYPTO_gcm128_release(loopargs[i].gcm_ctx);
|
||||
}
|
||||
#ifndef OPENSSL_NO_CAMELLIA
|
||||
#endif /* OPENSSL_NO_DEPRECATED_3_0 */
|
||||
#if !defined(OPENSSL_NO_CAMELLIA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_128_CML]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2626,9 +2516,9 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_128_CML], c[D_CBC_128_CML][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_128_CML][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_128_CML][testnum]); count++)
|
||||
Camellia_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &camellia_ks1,
|
||||
(size_t)lengths[testnum], &camellia_ks[0],
|
||||
iv, CAMELLIA_ENCRYPT);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_CBC_128_CML, testnum, count, d);
|
||||
@@ -2648,9 +2538,9 @@ int speed_main(int argc, char **argv)
|
||||
exit(1);
|
||||
}
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_192_CML][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_192_CML][testnum]); count++)
|
||||
Camellia_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &camellia_ks2,
|
||||
(size_t)lengths[testnum], &camellia_ks[1],
|
||||
iv, CAMELLIA_ENCRYPT);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_CBC_192_CML, testnum, count, d);
|
||||
@@ -2666,9 +2556,9 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_256_CML], c[D_CBC_256_CML][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_256_CML][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_256_CML][testnum]); count++)
|
||||
Camellia_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &camellia_ks3,
|
||||
(size_t)lengths[testnum], &camellia_ks[2],
|
||||
iv, CAMELLIA_ENCRYPT);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_CBC_256_CML, testnum, count, d);
|
||||
@@ -2686,7 +2576,7 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_IDEA], c[D_CBC_IDEA][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_IDEA][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_IDEA][testnum]); count++)
|
||||
IDEA_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &idea_ks,
|
||||
iv, IDEA_ENCRYPT);
|
||||
@@ -2695,7 +2585,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_SEED
|
||||
#if !defined(OPENSSL_NO_SEED) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_SEED]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2706,7 +2596,7 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_SEED], c[D_CBC_SEED][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_SEED][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_SEED][testnum]); count++)
|
||||
SEED_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &seed_ks, iv, 1);
|
||||
d = Time_F(STOP);
|
||||
@@ -2714,7 +2604,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC2
|
||||
#if !defined(OPENSSL_NO_RC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_RC2]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2729,7 +2619,7 @@ int speed_main(int argc, char **argv)
|
||||
exit(1);
|
||||
}
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_RC2][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_RC2][testnum]); count++)
|
||||
RC2_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &rc2_ks,
|
||||
iv, RC2_ENCRYPT);
|
||||
@@ -2738,7 +2628,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC5
|
||||
#if !defined(OPENSSL_NO_RC5) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_RC5]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2753,7 +2643,7 @@ int speed_main(int argc, char **argv)
|
||||
exit(1);
|
||||
}
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_RC5][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_RC5][testnum]); count++)
|
||||
RC5_32_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &rc5_ks,
|
||||
iv, RC5_ENCRYPT);
|
||||
@@ -2762,7 +2652,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_BF]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2773,7 +2663,7 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_BF], c[D_CBC_BF][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_BF][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_BF][testnum]); count++)
|
||||
BF_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &bf_ks,
|
||||
iv, BF_ENCRYPT);
|
||||
@@ -2782,7 +2672,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_CAST
|
||||
#if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
if (doit[D_CBC_CAST]) {
|
||||
if (async_jobs > 0) {
|
||||
BIO_printf(bio_err, "Async mode is not supported with %s\n",
|
||||
@@ -2793,7 +2683,7 @@ int speed_main(int argc, char **argv)
|
||||
print_message(names[D_CBC_CAST], c[D_CBC_CAST][testnum],
|
||||
lengths[testnum], seconds.sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; COND(c[D_CBC_CAST][testnum]); count++)
|
||||
for (count = 0; COND(c[D_CBC_CAST][testnum]); count++)
|
||||
CAST_cbc_encrypt(loopargs[0].buf, loopargs[0].buf,
|
||||
(size_t)lengths[testnum], &cast_ks,
|
||||
iv, CAST_ENCRYPT);
|
||||
@@ -2815,7 +2705,7 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
if (doit[D_EVP]) {
|
||||
if (evp_cipher != NULL) {
|
||||
int (*loopfunc)(void *args) = EVP_Update_loop;
|
||||
int (*loopfunc) (void *) = EVP_Update_loop;
|
||||
|
||||
if (multiblock && (EVP_CIPHER_flags(evp_cipher) &
|
||||
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
|
||||
@@ -2838,7 +2728,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP], save_count, lengths[testnum],
|
||||
print_message(names[D_EVP], c[D_EVP][testnum], lengths[testnum],
|
||||
seconds.sym);
|
||||
|
||||
for (k = 0; k < loopargs_len; k++) {
|
||||
@@ -2884,7 +2774,7 @@ int speed_main(int argc, char **argv)
|
||||
names[D_EVP] = OBJ_nid2ln(EVP_MD_type(evp_md));
|
||||
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP], save_count, lengths[testnum],
|
||||
print_message(names[D_EVP], c[D_EVP][testnum], lengths[testnum],
|
||||
seconds.sym);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EVP_Digest_loop, loopargs);
|
||||
@@ -2894,52 +2784,50 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
if (doit[D_EVP_HMAC]) {
|
||||
if (evp_hmac_md != NULL) {
|
||||
const char *md_name = OBJ_nid2ln(EVP_MD_type(evp_hmac_md));
|
||||
evp_hmac_name = app_malloc(sizeof("HMAC()") + strlen(md_name),
|
||||
"HMAC name");
|
||||
sprintf(evp_hmac_name, "HMAC(%s)", md_name);
|
||||
names[D_EVP_HMAC] = evp_hmac_name;
|
||||
if (doit[D_EVP_HMAC] && evp_hmac_md != NULL) {
|
||||
const char *md_name = OBJ_nid2ln(EVP_MD_type(evp_hmac_md));
|
||||
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP_HMAC], save_count, lengths[testnum],
|
||||
seconds.sym);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EVP_HMAC_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_EVP_HMAC, testnum, count, d);
|
||||
}
|
||||
evp_hmac_name = app_malloc(sizeof("HMAC()") + strlen(md_name),
|
||||
"HMAC name");
|
||||
sprintf(evp_hmac_name, "HMAC(%s)", md_name);
|
||||
names[D_EVP_HMAC] = evp_hmac_name;
|
||||
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP_HMAC], c[D_EVP_HMAC][testnum], lengths[testnum],
|
||||
seconds.sym);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EVP_HMAC_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_EVP_HMAC, testnum, count, d);
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_CMAC
|
||||
if (doit[D_EVP_CMAC]) {
|
||||
if (evp_cmac_cipher != NULL) {
|
||||
const char *cipher_name = OBJ_nid2ln(EVP_CIPHER_type(evp_cmac_cipher));
|
||||
evp_cmac_name = app_malloc(sizeof("CMAC()") + strlen(cipher_name),
|
||||
"CMAC name");
|
||||
sprintf(evp_cmac_name, "CMAC(%s)", cipher_name);
|
||||
names[D_EVP_CMAC] = evp_cmac_name;
|
||||
if (doit[D_EVP_CMAC] && evp_cmac_cipher != NULL) {
|
||||
const char *cipher_name = OBJ_nid2ln(EVP_CIPHER_type(evp_cmac_cipher));
|
||||
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
loopargs[i].cmac_ctx = CMAC_CTX_new();
|
||||
if (loopargs[i].cmac_ctx == NULL) {
|
||||
BIO_printf(bio_err, "CMAC malloc failure, exiting...");
|
||||
exit(1);
|
||||
}
|
||||
evp_cmac_name = app_malloc(sizeof("CMAC()") + strlen(cipher_name),
|
||||
"CMAC name");
|
||||
sprintf(evp_cmac_name, "CMAC(%s)", cipher_name);
|
||||
names[D_EVP_CMAC] = evp_cmac_name;
|
||||
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
loopargs[i].cmac_ctx = CMAC_CTX_new();
|
||||
if (loopargs[i].cmac_ctx == NULL) {
|
||||
BIO_printf(bio_err, "CMAC malloc failure, exiting...");
|
||||
exit(1);
|
||||
}
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP_CMAC], save_count, lengths[testnum],
|
||||
seconds.sym);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EVP_CMAC_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_EVP_CMAC, testnum, count, d);
|
||||
}
|
||||
for (i = 0; i < loopargs_len; i++)
|
||||
CMAC_CTX_free(loopargs[i].cmac_ctx);
|
||||
}
|
||||
for (testnum = 0; testnum < size_num; testnum++) {
|
||||
print_message(names[D_EVP_CMAC], c[D_EVP_CMAC][testnum], lengths[testnum],
|
||||
seconds.sym);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EVP_CMAC_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
print_result(D_EVP_CMAC, testnum, count, d);
|
||||
}
|
||||
for (i = 0; i < loopargs_len; i++)
|
||||
CMAC_CTX_free(loopargs[i].cmac_ctx);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -2953,7 +2841,7 @@ int speed_main(int argc, char **argv)
|
||||
if (!rsa_doit[testnum])
|
||||
continue;
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
if (primes > 2) {
|
||||
if (primes > RSA_DEFAULT_PRIME_NUM) {
|
||||
/* we haven't set keys yet, generate multi-prime RSA keys */
|
||||
BIGNUM *bn = BN_new();
|
||||
|
||||
@@ -2974,7 +2862,7 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (!RSA_generate_multi_prime_key(loopargs[i].rsa_key[testnum],
|
||||
rsa_bits[testnum],
|
||||
rsa_keys[testnum].bits,
|
||||
primes, bn, NULL)) {
|
||||
BN_free(bn);
|
||||
goto end;
|
||||
@@ -2993,7 +2881,7 @@ int speed_main(int argc, char **argv)
|
||||
rsa_count = 1;
|
||||
} else {
|
||||
pkey_print_message("private", "rsa",
|
||||
rsa_c[testnum][0], rsa_bits[testnum],
|
||||
rsa_c[testnum][0], rsa_keys[testnum].bits,
|
||||
seconds.rsa);
|
||||
/* RSA_blinding_on(rsa_key[testnum],NULL); */
|
||||
Time_F(START);
|
||||
@@ -3002,7 +2890,7 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R1:%ld:%d:%.2f\n"
|
||||
: "%ld %u bits private RSA's in %.2fs\n",
|
||||
count, rsa_bits[testnum], d);
|
||||
count, rsa_keys[testnum].bits, d);
|
||||
rsa_results[testnum][0] = (double)count / d;
|
||||
rsa_count = count;
|
||||
}
|
||||
@@ -3020,7 +2908,7 @@ int speed_main(int argc, char **argv)
|
||||
rsa_doit[testnum] = 0;
|
||||
} else {
|
||||
pkey_print_message("public", "rsa",
|
||||
rsa_c[testnum][1], rsa_bits[testnum],
|
||||
rsa_c[testnum][1], rsa_keys[testnum].bits,
|
||||
seconds.rsa);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, RSA_verify_loop, loopargs);
|
||||
@@ -3028,14 +2916,13 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R2:%ld:%d:%.2f\n"
|
||||
: "%ld %u bits public RSA's in %.2fs\n",
|
||||
count, rsa_bits[testnum], d);
|
||||
count, rsa_keys[testnum].bits, d);
|
||||
rsa_results[testnum][1] = (double)count / d;
|
||||
}
|
||||
|
||||
if (rsa_count <= 1) {
|
||||
/* if longer than 10s, don't do any more */
|
||||
for (testnum++; testnum < RSA_NUM; testnum++)
|
||||
rsa_doit[testnum] = 0;
|
||||
stop_it(rsa_doit, testnum);
|
||||
}
|
||||
}
|
||||
#endif /* OPENSSL_NO_RSA */
|
||||
@@ -3105,8 +2992,7 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
if (rsa_count <= 1) {
|
||||
/* if longer than 10s, don't do any more */
|
||||
for (testnum++; testnum < DSA_NUM; testnum++)
|
||||
dsa_doit[testnum] = 0;
|
||||
stop_it(dsa_doit, testnum);
|
||||
}
|
||||
}
|
||||
#endif /* OPENSSL_NO_DSA */
|
||||
@@ -3119,7 +3005,7 @@ int speed_main(int argc, char **argv)
|
||||
continue; /* Ignore Curve */
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
loopargs[i].ecdsa[testnum] =
|
||||
EC_KEY_new_by_curve_name(test_curves[testnum].nid);
|
||||
EC_KEY_new_by_curve_name(ec_curves[testnum].nid);
|
||||
if (loopargs[i].ecdsa[testnum] == NULL) {
|
||||
st = 0;
|
||||
break;
|
||||
@@ -3148,7 +3034,7 @@ int speed_main(int argc, char **argv)
|
||||
} else {
|
||||
pkey_print_message("sign", "ecdsa",
|
||||
ecdsa_c[testnum][0],
|
||||
test_curves[testnum].bits, seconds.ecdsa);
|
||||
ec_curves[testnum].bits, seconds.ecdsa);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, ECDSA_sign_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
@@ -3156,7 +3042,7 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R5:%ld:%u:%.2f\n" :
|
||||
"%ld %u bits ECDSA signs in %.2fs \n",
|
||||
count, test_curves[testnum].bits, d);
|
||||
count, ec_curves[testnum].bits, d);
|
||||
ecdsa_results[testnum][0] = (double)count / d;
|
||||
rsa_count = count;
|
||||
}
|
||||
@@ -3177,21 +3063,20 @@ int speed_main(int argc, char **argv)
|
||||
} else {
|
||||
pkey_print_message("verify", "ecdsa",
|
||||
ecdsa_c[testnum][1],
|
||||
test_curves[testnum].bits, seconds.ecdsa);
|
||||
ec_curves[testnum].bits, seconds.ecdsa);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, ECDSA_verify_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R6:%ld:%u:%.2f\n"
|
||||
: "%ld %u bits ECDSA verify in %.2fs\n",
|
||||
count, test_curves[testnum].bits, d);
|
||||
count, ec_curves[testnum].bits, d);
|
||||
ecdsa_results[testnum][1] = (double)count / d;
|
||||
}
|
||||
|
||||
if (rsa_count <= 1) {
|
||||
/* if longer than 10s, don't do any more */
|
||||
for (testnum++; testnum < ECDSA_NUM; testnum++)
|
||||
ecdsa_doit[testnum] = 0;
|
||||
stop_it(ecdsa_doit, testnum);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3224,7 +3109,7 @@ int speed_main(int argc, char **argv)
|
||||
* If this fails we try creating a EVP_PKEY_EC generic param ctx,
|
||||
* then we set the curve by NID before deriving the actual keygen
|
||||
* ctx for that specific curve. */
|
||||
kctx = EVP_PKEY_CTX_new_id(test_curves[testnum].nid, NULL); /* keygen ctx from NID */
|
||||
kctx = EVP_PKEY_CTX_new_id(ec_curves[testnum].nid, NULL); /* keygen ctx from NID */
|
||||
if (!kctx) {
|
||||
EVP_PKEY_CTX *pctx = NULL;
|
||||
EVP_PKEY *params = NULL;
|
||||
@@ -3247,13 +3132,13 @@ int speed_main(int argc, char **argv)
|
||||
break;
|
||||
}
|
||||
|
||||
if ( /* Create the context for parameter generation */
|
||||
!(pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) ||
|
||||
/* Create the context for parameter generation */
|
||||
if (!(pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) ||
|
||||
/* Initialise the parameter generation */
|
||||
!EVP_PKEY_paramgen_init(pctx) ||
|
||||
/* Set the curve by NID */
|
||||
!EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
|
||||
test_curves
|
||||
ec_curves
|
||||
[testnum].nid) ||
|
||||
/* Create the parameter object params */
|
||||
!EVP_PKEY_paramgen(pctx, ¶ms)) {
|
||||
@@ -3336,7 +3221,7 @@ int speed_main(int argc, char **argv)
|
||||
if (ecdh_checks != 0) {
|
||||
pkey_print_message("", "ecdh",
|
||||
ecdh_c[testnum][0],
|
||||
test_curves[testnum].bits, seconds.ecdh);
|
||||
ec_curves[testnum].bits, seconds.ecdh);
|
||||
Time_F(START);
|
||||
count =
|
||||
run_benchmark(async_jobs, ECDH_EVP_derive_key_loop, loopargs);
|
||||
@@ -3344,15 +3229,14 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R7:%ld:%d:%.2f\n" :
|
||||
"%ld %u-bits ECDH ops in %.2fs\n", count,
|
||||
test_curves[testnum].bits, d);
|
||||
ec_curves[testnum].bits, d);
|
||||
ecdh_results[testnum][0] = (double)count / d;
|
||||
rsa_count = count;
|
||||
}
|
||||
|
||||
if (rsa_count <= 1) {
|
||||
/* if longer than 10s, don't do any more */
|
||||
for (testnum++; testnum < OSSL_NELEM(ecdh_doit); testnum++)
|
||||
ecdh_doit[testnum] = 0;
|
||||
stop_it(ecdh_doit, testnum);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3370,7 +3254,7 @@ int speed_main(int argc, char **argv)
|
||||
break;
|
||||
}
|
||||
|
||||
if ((ed_pctx = EVP_PKEY_CTX_new_id(test_ed_curves[testnum].nid, NULL))
|
||||
if ((ed_pctx = EVP_PKEY_CTX_new_id(ed_curves[testnum].nid, NULL))
|
||||
== NULL
|
||||
|| EVP_PKEY_keygen_init(ed_pctx) <= 0
|
||||
|| EVP_PKEY_keygen(ed_pctx, &ed_pkey) <= 0) {
|
||||
@@ -3395,7 +3279,7 @@ int speed_main(int argc, char **argv)
|
||||
} else {
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
/* Perform EdDSA signature test */
|
||||
loopargs[i].sigsize = test_ed_curves[testnum].sigsize;
|
||||
loopargs[i].sigsize = ed_curves[testnum].sigsize;
|
||||
st = EVP_DigestSign(loopargs[i].eddsa_ctx[testnum],
|
||||
loopargs[i].buf2, &loopargs[i].sigsize,
|
||||
loopargs[i].buf, 20);
|
||||
@@ -3408,9 +3292,9 @@ int speed_main(int argc, char **argv)
|
||||
ERR_print_errors(bio_err);
|
||||
rsa_count = 1;
|
||||
} else {
|
||||
pkey_print_message("sign", test_ed_curves[testnum].name,
|
||||
pkey_print_message("sign", ed_curves[testnum].name,
|
||||
eddsa_c[testnum][0],
|
||||
test_ed_curves[testnum].bits, seconds.eddsa);
|
||||
ed_curves[testnum].bits, seconds.eddsa);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EdDSA_sign_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
@@ -3418,8 +3302,8 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R8:%ld:%u:%s:%.2f\n" :
|
||||
"%ld %u bits %s signs in %.2fs \n",
|
||||
count, test_ed_curves[testnum].bits,
|
||||
test_ed_curves[testnum].name, d);
|
||||
count, ed_curves[testnum].bits,
|
||||
ed_curves[testnum].name, d);
|
||||
eddsa_results[testnum][0] = (double)count / d;
|
||||
rsa_count = count;
|
||||
}
|
||||
@@ -3438,24 +3322,23 @@ int speed_main(int argc, char **argv)
|
||||
ERR_print_errors(bio_err);
|
||||
eddsa_doit[testnum] = 0;
|
||||
} else {
|
||||
pkey_print_message("verify", test_ed_curves[testnum].name,
|
||||
pkey_print_message("verify", ed_curves[testnum].name,
|
||||
eddsa_c[testnum][1],
|
||||
test_ed_curves[testnum].bits, seconds.eddsa);
|
||||
ed_curves[testnum].bits, seconds.eddsa);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, EdDSA_verify_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R9:%ld:%u:%s:%.2f\n"
|
||||
: "%ld %u bits %s verify in %.2fs\n",
|
||||
count, test_ed_curves[testnum].bits,
|
||||
test_ed_curves[testnum].name, d);
|
||||
count, ed_curves[testnum].bits,
|
||||
ed_curves[testnum].name, d);
|
||||
eddsa_results[testnum][1] = (double)count / d;
|
||||
}
|
||||
|
||||
if (rsa_count <= 1) {
|
||||
/* if longer than 10s, don't do any more */
|
||||
for (testnum++; testnum < EdDSA_NUM; testnum++)
|
||||
eddsa_doit[testnum] = 0;
|
||||
stop_it(eddsa_doit, testnum);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3464,105 +3347,73 @@ int speed_main(int argc, char **argv)
|
||||
for (testnum = 0; testnum < SM2_NUM; testnum++) {
|
||||
int st = 1;
|
||||
EVP_PKEY *sm2_pkey = NULL;
|
||||
EVP_PKEY_CTX *pctx = NULL;
|
||||
EVP_PKEY_CTX *sm2_pctx = NULL;
|
||||
EVP_PKEY_CTX *sm2_vfy_pctx = NULL;
|
||||
size_t sm2_sigsize = 0;
|
||||
|
||||
if (!sm2_doit[testnum])
|
||||
continue; /* Ignore Curve */
|
||||
/* Init signing and verification */
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
EVP_PKEY_CTX *sm2_pctx = NULL;
|
||||
EVP_PKEY_CTX *sm2_vfy_pctx = NULL;
|
||||
EVP_PKEY_CTX *pctx = NULL;
|
||||
st = 0;
|
||||
|
||||
loopargs[i].sm2_ctx[testnum] = EVP_MD_CTX_new();
|
||||
if (loopargs[i].sm2_ctx[testnum] == NULL) {
|
||||
st = 0;
|
||||
break;
|
||||
}
|
||||
loopargs[i].sm2_vfy_ctx[testnum] = EVP_MD_CTX_new();
|
||||
if (loopargs[i].sm2_vfy_ctx[testnum] == NULL) {
|
||||
st = 0;
|
||||
if (loopargs[i].sm2_ctx[testnum] == NULL
|
||||
|| loopargs[i].sm2_vfy_ctx[testnum] == NULL)
|
||||
break;
|
||||
}
|
||||
|
||||
/* SM2 keys are generated as normal EC keys with a special curve */
|
||||
if ((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL
|
||||
st = !((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL
|
||||
|| EVP_PKEY_keygen_init(pctx) <= 0
|
||||
|| EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
|
||||
test_sm2_curves[testnum].nid) <= 0
|
||||
|| EVP_PKEY_keygen(pctx, &sm2_pkey) <= 0) {
|
||||
st = 0;
|
||||
EVP_PKEY_CTX_free(pctx);
|
||||
break;
|
||||
}
|
||||
/* free previous one and alloc a new one */
|
||||
sm2_curves[testnum].nid) <= 0
|
||||
|| EVP_PKEY_keygen(pctx, &sm2_pkey) <= 0);
|
||||
EVP_PKEY_CTX_free(pctx);
|
||||
|
||||
loopargs[i].sigsize = sm2_sigsize
|
||||
= ECDSA_size(EVP_PKEY_get0_EC_KEY(sm2_pkey));
|
||||
|
||||
if (!EVP_PKEY_set_alias_type(sm2_pkey, EVP_PKEY_SM2)) {
|
||||
st = 0;
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
if (st == 0)
|
||||
break;
|
||||
|
||||
st = 0; /* set back to zero */
|
||||
/* attach it sooner to rely on main final cleanup */
|
||||
loopargs[i].sm2_pkey[testnum] = sm2_pkey;
|
||||
loopargs[i].sigsize = ECDSA_size(EVP_PKEY_get0_EC_KEY(sm2_pkey));
|
||||
if (!EVP_PKEY_set_alias_type(sm2_pkey, EVP_PKEY_SM2))
|
||||
break;
|
||||
}
|
||||
|
||||
sm2_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL);
|
||||
if (sm2_pctx == NULL) {
|
||||
st = 0;
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
break;
|
||||
}
|
||||
sm2_vfy_pctx = EVP_PKEY_CTX_new(sm2_pkey, NULL);
|
||||
if (sm2_vfy_pctx == NULL) {
|
||||
st = 0;
|
||||
EVP_PKEY_CTX_free(sm2_pctx);
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
if (sm2_pctx == NULL || sm2_vfy_pctx == NULL) {
|
||||
EVP_PKEY_CTX_free(sm2_vfy_pctx);
|
||||
break;
|
||||
}
|
||||
/* attach them directly to respective ctx */
|
||||
EVP_MD_CTX_set_pkey_ctx(loopargs[i].sm2_ctx[testnum], sm2_pctx);
|
||||
EVP_MD_CTX_set_pkey_ctx(loopargs[i].sm2_vfy_ctx[testnum], sm2_vfy_pctx);
|
||||
|
||||
/*
|
||||
* No need to allow user to set an explicit ID here, just use
|
||||
* the one defined in the 'draft-yang-tls-tl13-sm-suites' I-D.
|
||||
*/
|
||||
if (EVP_PKEY_CTX_set1_id(sm2_pctx, SM2_ID, SM2_ID_LEN) != 1) {
|
||||
st = 0;
|
||||
EVP_PKEY_CTX_free(sm2_pctx);
|
||||
EVP_PKEY_CTX_free(sm2_vfy_pctx);
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
if (EVP_PKEY_CTX_set1_id(sm2_pctx, SM2_ID, SM2_ID_LEN) != 1
|
||||
|| EVP_PKEY_CTX_set1_id(sm2_vfy_pctx, SM2_ID, SM2_ID_LEN) != 1)
|
||||
break;
|
||||
}
|
||||
|
||||
if (EVP_PKEY_CTX_set1_id(sm2_vfy_pctx, SM2_ID, SM2_ID_LEN) != 1) {
|
||||
st = 0;
|
||||
EVP_PKEY_CTX_free(sm2_pctx);
|
||||
EVP_PKEY_CTX_free(sm2_vfy_pctx);
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
break;
|
||||
}
|
||||
|
||||
EVP_MD_CTX_set_pkey_ctx(loopargs[i].sm2_ctx[testnum], sm2_pctx);
|
||||
EVP_MD_CTX_set_pkey_ctx(loopargs[i].sm2_vfy_ctx[testnum], sm2_vfy_pctx);
|
||||
|
||||
if (!EVP_DigestSignInit(loopargs[i].sm2_ctx[testnum], NULL,
|
||||
EVP_sm3(), NULL, sm2_pkey)) {
|
||||
st = 0;
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
EVP_sm3(), NULL, sm2_pkey))
|
||||
break;
|
||||
}
|
||||
if (!EVP_DigestVerifyInit(loopargs[i].sm2_vfy_ctx[testnum], NULL,
|
||||
EVP_sm3(), NULL, sm2_pkey)) {
|
||||
st = 0;
|
||||
EVP_PKEY_free(sm2_pkey);
|
||||
EVP_sm3(), NULL, sm2_pkey))
|
||||
break;
|
||||
}
|
||||
loopargs[i].sm2_pkey[testnum] = sm2_pkey;
|
||||
st = 1; /* mark loop as succeeded */
|
||||
}
|
||||
if (st == 0) {
|
||||
BIO_printf(bio_err, "SM2 failure.\n");
|
||||
BIO_printf(bio_err, "SM2 init failure.\n");
|
||||
ERR_print_errors(bio_err);
|
||||
rsa_count = 1;
|
||||
} else {
|
||||
for (i = 0; i < loopargs_len; i++) {
|
||||
sm2_sigsize = loopargs[i].sigsize;
|
||||
size_t sm2_sigsize = loopargs[i].sigsize;
|
||||
|
||||
/* Perform SM2 signature test */
|
||||
st = EVP_DigestSign(loopargs[i].sm2_ctx[testnum],
|
||||
loopargs[i].buf2, &sm2_sigsize,
|
||||
@@ -3576,9 +3427,9 @@ int speed_main(int argc, char **argv)
|
||||
ERR_print_errors(bio_err);
|
||||
rsa_count = 1;
|
||||
} else {
|
||||
pkey_print_message("sign", test_sm2_curves[testnum].name,
|
||||
pkey_print_message("sign", sm2_curves[testnum].name,
|
||||
sm2_c[testnum][0],
|
||||
test_sm2_curves[testnum].bits, seconds.sm2);
|
||||
sm2_curves[testnum].bits, seconds.sm2);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, SM2_sign_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
@@ -3586,8 +3437,8 @@ int speed_main(int argc, char **argv)
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R8:%ld:%u:%s:%.2f\n" :
|
||||
"%ld %u bits %s signs in %.2fs \n",
|
||||
count, test_sm2_curves[testnum].bits,
|
||||
test_sm2_curves[testnum].name, d);
|
||||
count, sm2_curves[testnum].bits,
|
||||
sm2_curves[testnum].name, d);
|
||||
sm2_results[testnum][0] = (double)count / d;
|
||||
rsa_count = count;
|
||||
}
|
||||
@@ -3606,17 +3457,17 @@ int speed_main(int argc, char **argv)
|
||||
ERR_print_errors(bio_err);
|
||||
sm2_doit[testnum] = 0;
|
||||
} else {
|
||||
pkey_print_message("verify", test_sm2_curves[testnum].name,
|
||||
pkey_print_message("verify", sm2_curves[testnum].name,
|
||||
sm2_c[testnum][1],
|
||||
test_sm2_curves[testnum].bits, seconds.sm2);
|
||||
sm2_curves[testnum].bits, seconds.sm2);
|
||||
Time_F(START);
|
||||
count = run_benchmark(async_jobs, SM2_verify_loop, loopargs);
|
||||
d = Time_F(STOP);
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R9:%ld:%u:%s:%.2f\n"
|
||||
: "%ld %u bits %s verify in %.2fs\n",
|
||||
count, test_sm2_curves[testnum].bits,
|
||||
test_sm2_curves[testnum].name, d);
|
||||
count, sm2_curves[testnum].bits,
|
||||
sm2_curves[testnum].name, d);
|
||||
sm2_results[testnum][1] = (double)count / d;
|
||||
}
|
||||
|
||||
@@ -3638,20 +3489,22 @@ int speed_main(int argc, char **argv)
|
||||
printf("built on: %s\n", OpenSSL_version(OPENSSL_BUILT_ON));
|
||||
printf("options:");
|
||||
printf("%s ", BN_options());
|
||||
#ifndef OPENSSL_NO_MD2
|
||||
#if !defined(OPENSSL_NO_MD2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
printf("%s ", MD2_options());
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_RC4
|
||||
#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
printf("%s ", RC4_options());
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DES
|
||||
printf("%s ", DES_options());
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
printf("%s ", AES_options());
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_IDEA
|
||||
printf("%s ", IDEA_options());
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_BF
|
||||
#if !defined(OPENSSL_NO_BF) && !defined(OPENSSL_NO_DEPRECATED_3_0)
|
||||
printf("%s ", BF_options());
|
||||
#endif
|
||||
printf("\n%s\n", OpenSSL_version(OPENSSL_CFLAGS));
|
||||
@@ -3697,10 +3550,10 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
if (mr)
|
||||
printf("+F2:%u:%u:%f:%f\n",
|
||||
k, rsa_bits[k], rsa_results[k][0], rsa_results[k][1]);
|
||||
k, rsa_keys[k].bits, rsa_results[k][0], rsa_results[k][1]);
|
||||
else
|
||||
printf("rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
|
||||
rsa_bits[k], 1.0 / rsa_results[k][0], 1.0 / rsa_results[k][1],
|
||||
rsa_keys[k].bits, 1.0 / rsa_results[k][0], 1.0 / rsa_results[k][1],
|
||||
rsa_results[k][0], rsa_results[k][1]);
|
||||
}
|
||||
#endif
|
||||
@@ -3734,11 +3587,11 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
if (mr)
|
||||
printf("+F4:%u:%u:%f:%f\n",
|
||||
k, test_curves[k].bits,
|
||||
k, ec_curves[k].bits,
|
||||
ecdsa_results[k][0], ecdsa_results[k][1]);
|
||||
else
|
||||
printf("%4u bits ecdsa (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
|
||||
test_curves[k].bits, test_curves[k].name,
|
||||
ec_curves[k].bits, ec_curves[k].name,
|
||||
1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
|
||||
ecdsa_results[k][0], ecdsa_results[k][1]);
|
||||
}
|
||||
@@ -3753,12 +3606,12 @@ int speed_main(int argc, char **argv)
|
||||
}
|
||||
if (mr)
|
||||
printf("+F5:%u:%u:%f:%f\n",
|
||||
k, test_curves[k].bits,
|
||||
k, ec_curves[k].bits,
|
||||
ecdh_results[k][0], 1.0 / ecdh_results[k][0]);
|
||||
|
||||
else
|
||||
printf("%4u bits ecdh (%s) %8.4fs %8.1f\n",
|
||||
test_curves[k].bits, test_curves[k].name,
|
||||
ec_curves[k].bits, ec_curves[k].name,
|
||||
1.0 / ecdh_results[k][0], ecdh_results[k][0]);
|
||||
}
|
||||
|
||||
@@ -3773,11 +3626,11 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
if (mr)
|
||||
printf("+F6:%u:%u:%s:%f:%f\n",
|
||||
k, test_ed_curves[k].bits, test_ed_curves[k].name,
|
||||
k, ed_curves[k].bits, ed_curves[k].name,
|
||||
eddsa_results[k][0], eddsa_results[k][1]);
|
||||
else
|
||||
printf("%4u bits EdDSA (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
|
||||
test_ed_curves[k].bits, test_ed_curves[k].name,
|
||||
ed_curves[k].bits, ed_curves[k].name,
|
||||
1.0 / eddsa_results[k][0], 1.0 / eddsa_results[k][1],
|
||||
eddsa_results[k][0], eddsa_results[k][1]);
|
||||
}
|
||||
@@ -3794,16 +3647,16 @@ int speed_main(int argc, char **argv)
|
||||
|
||||
if (mr)
|
||||
printf("+F6:%u:%u:%s:%f:%f\n",
|
||||
k, test_sm2_curves[k].bits, test_sm2_curves[k].name,
|
||||
k, sm2_curves[k].bits, sm2_curves[k].name,
|
||||
sm2_results[k][0], sm2_results[k][1]);
|
||||
else
|
||||
printf("%4u bits SM2 (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
|
||||
test_sm2_curves[k].bits, test_sm2_curves[k].name,
|
||||
sm2_curves[k].bits, sm2_curves[k].name,
|
||||
1.0 / sm2_results[k][0], 1.0 / sm2_results[k][1],
|
||||
sm2_results[k][0], sm2_results[k][1]);
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
#endif /* OPENSSL_NO_EC */
|
||||
|
||||
ret = 0;
|
||||
|
||||
@@ -3875,6 +3728,7 @@ static void print_message(const char *s, long num, int length, int tm)
|
||||
mr ? "+DT:%s:%d:%d\n"
|
||||
: "Doing %s for %ds on %d size blocks: ", s, tm, length);
|
||||
(void)BIO_flush(bio_err);
|
||||
run = 1;
|
||||
alarm(tm);
|
||||
#else
|
||||
BIO_printf(bio_err,
|
||||
@@ -3892,6 +3746,7 @@ static void pkey_print_message(const char *str, const char *str2, long num,
|
||||
mr ? "+DTP:%d:%s:%s:%d\n"
|
||||
: "Doing %u bits %s %s's for %ds: ", bits, str, str2, tm);
|
||||
(void)BIO_flush(bio_err);
|
||||
run = 1;
|
||||
alarm(tm);
|
||||
#else
|
||||
BIO_printf(bio_err,
|
||||
@@ -3904,8 +3759,10 @@ static void pkey_print_message(const char *str, const char *str2, long num,
|
||||
static void print_result(int alg, int run_no, int count, double time_used)
|
||||
{
|
||||
if (count == -1) {
|
||||
BIO_puts(bio_err, "EVP error!\n");
|
||||
exit(1);
|
||||
BIO_printf(bio_err, "%s error!\n", names[alg]);
|
||||
ERR_print_errors(bio_err);
|
||||
/* exit(1); disable exit until default provider enabled */
|
||||
return;
|
||||
}
|
||||
BIO_printf(bio_err,
|
||||
mr ? "+R:%d:%s:%f\n"
|
||||
@@ -4064,6 +3921,7 @@ static int do_multi(int multi, int size_num)
|
||||
p = buf + 4;
|
||||
k = atoi(sstrsep(&p, sep));
|
||||
sstrsep(&p, sep);
|
||||
sstrsep(&p, sep);
|
||||
|
||||
d = atof(sstrsep(&p, sep));
|
||||
eddsa_results[k][0] += d;
|
||||
@@ -4137,7 +3995,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
|
||||
for (j = 0; j < num; j++) {
|
||||
print_message(alg_name, 0, mblengths[j], seconds->sym);
|
||||
Time_F(START);
|
||||
for (count = 0, run = 1; run && count < 0x7fffffff; count++) {
|
||||
for (count = 0; run && count < 0x7fffffff; count++) {
|
||||
unsigned char aad[EVP_AEAD_TLS1_AAD_LEN];
|
||||
EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
|
||||
size_t len = mblengths[j];
|
||||
|
||||
Reference in New Issue
Block a user