[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Wed May 30 16:27:11 UTC 2018
The branch master has been updated
via 2fc45cb805f85589bb49c3669864152e909696da (commit)
via 44ca7565a6c73cbff17ee94c9f83b871c8c91445 (commit)
via ffcca684ec7bd2d3081a0f5a5befa9972fdd7765 (commit)
from 1e8d5ea5df61daa46e8874d1f443e0e75211253b (commit)
- Log -----------------------------------------------------------------
commit 2fc45cb805f85589bb49c3669864152e909696da
Author: Andy Polyakov <appro at openssl.org>
Date: Mon May 21 14:26:54 2018 +0200
apps/speed.c: address asan failure with small -bytes and large -misalign.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6311)
commit 44ca7565a6c73cbff17ee94c9f83b871c8c91445
Author: Andy Polyakov <appro at openssl.org>
Date: Sat May 19 15:43:11 2018 +0200
apps/speed.c: add -aead flag.
Goal is to exercise AEAD ciphers in TLS-like sequence, i.e. 13-byte
AAD followed by payload. Update doc/man1/speed.pod accordingly.
[While we are at it, address even some styling and readability issues.]
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6311)
commit ffcca684ec7bd2d3081a0f5a5befa9972fdd7765
Author: Andy Polyakov <appro at openssl.org>
Date: Sat May 19 15:53:29 2018 +0200
apps/speed.c: clean up SIGARM handling.
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6311)
-----------------------------------------------------------------------
Summary of changes:
apps/speed.c | 202 +++++++++++++++++++++++++++++++++++------------------
doc/man1/speed.pod | 14 ++--
2 files changed, 145 insertions(+), 71 deletions(-)
diff --git a/apps/speed.c b/apps/speed.c
index e513263..768e3a1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -169,6 +169,7 @@ 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);
@@ -197,29 +198,33 @@ static const int lengths_list[] = {
};
static const int *lengths = lengths_list;
+static const int aead_lengths_list[] = {
+ 2, 31, 136, 1024, 8 * 1024, 16 * 1024
+};
+
+#define START 0
+#define STOP 1
+
#ifdef SIGALRM
-# if defined(__STDC__) || defined(sgi) || defined(_AIX)
-# define SIGRETTYPE void
-# else
-# define SIGRETTYPE int
-# endif
-static SIGRETTYPE sig_done(int sig);
-static SIGRETTYPE sig_done(int sig)
+static void alarmed(int sig)
{
- signal(SIGALRM, sig_done);
+ signal(SIGALRM, alarmed);
run = 0;
}
-#endif
-#define START 0
-#define STOP 1
+static double Time_F(int s)
+{
+ double ret = app_tminterval(s, usertime);
+ if (s == STOP)
+ alarm(0);
+ return ret;
+}
-#if defined(_WIN32)
+#elif defined(_WIN32)
+
+# define SIGALRM -1
-# if !defined(SIGALRM)
-# define SIGALRM
-# endif
static unsigned int lapse;
static volatile unsigned int schlock;
static void alarm_win32(unsigned int secs)
@@ -263,13 +268,9 @@ static double Time_F(int s)
return ret;
}
#else
-
static double Time_F(int s)
{
- double ret = app_tminterval(s, usertime);
- if (s == STOP)
- alarm(0);
- return ret;
+ return app_tminterval(s, usertime);
}
#endif
@@ -295,38 +296,41 @@ typedef enum OPTION_choice {
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
OPT_ELAPSED, OPT_EVP, OPT_DECRYPT, OPT_ENGINE, OPT_MULTI,
OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_R_ENUM,
- OPT_PRIMES, OPT_SECONDS, OPT_BYTES
+ OPT_PRIMES, OPT_SECONDS, OPT_BYTES, OPT_AEAD
} OPTION_CHOICE;
const OPTIONS speed_options[] = {
{OPT_HELP_STR, 1, '-', "Usage: %s [options] ciphers...\n"},
{OPT_HELP_STR, 1, '-', "Valid options are:\n"},
{"help", OPT_HELP, '-', "Display this summary"},
- {"evp", OPT_EVP, 's', "Use specified EVP cipher"},
+ {"evp", OPT_EVP, 's', "Use EVP-named cipher or digest"},
{"decrypt", OPT_DECRYPT, '-',
"Time decryption instead of encryption (only EVP)"},
- {"mr", OPT_MR, '-', "Produce machine readable output"},
+ {"aead", OPT_AEAD, '-',
+ "Benchmark EVP-named AEAD cipher in TLS-like sequence"},
{"mb", OPT_MB, '-',
- "Enable (tls1.1) multi-block mode on evp_cipher requested with -evp"},
- {"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"},
- {"elapsed", OPT_ELAPSED, '-',
- "Measure time in real time instead of CPU user time"},
+ "Enable (tls1>=1) multi-block mode on EVP-named cipher"},
+ {"mr", OPT_MR, '-', "Produce machine readable output"},
#ifndef NO_FORK
{"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
#endif
#ifndef OPENSSL_NO_ASYNC
{"async_jobs", OPT_ASYNCJOBS, 'p',
- "Enable async mode and start pnum jobs"},
+ "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
+ {"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 pnum seconds"},
+ "Run benchmarks for specified amount of seconds"},
{"bytes", OPT_BYTES, 'p',
- "Run cipher, digest and rand benchmarks on pnum bytes"},
+ "Run [non-PKI] benchmarks on custom-sized buffer"},
+ {"misalign", OPT_MISALIGN, 'p',
+ "Use specified offset to mis-align buffers"},
{NULL}
};
@@ -915,6 +919,7 @@ static int EVP_Update_loop(void *args)
EVP_EncryptFinal_ex(ctx, buf, &outl);
return count;
}
+
/*
* CCM does not support streaming. For the purpose of performance measurement,
* each message is encrypted using the same (key,iv)-pair. Do not use this
@@ -949,6 +954,42 @@ static int EVP_Update_loop_ccm(void *args)
return count;
}
+/*
+ * To make AEAD benchmarking more relevant perform TLS-like operations,
+ * 13-byte AAD followed by payload. But don't use TLS-formatted AAD, as
+ * payload length is not actually limited by 16KB...
+ */
+static int EVP_Update_loop_aead(void *args)
+{
+ loopargs_t *tempargs = *(loopargs_t **) args;
+ unsigned char *buf = tempargs->buf;
+ EVP_CIPHER_CTX *ctx = tempargs->ctx;
+ 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++) {
+ EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv);
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+ sizeof(faketag), faketag);
+ EVP_DecryptUpdate(ctx, NULL, &outl, aad, sizeof(aad));
+ EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]);
+ EVP_DecryptFinal_ex(ctx, buf + outl, &outl);
+ }
+ } else {
+ for (count = 0; COND(nb_iter); 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]);
+ EVP_EncryptFinal_ex(ctx, buf + outl, &outl);
+ }
+ }
+ return count;
+}
+
static const EVP_MD *evp_md = NULL;
static int EVP_Digest_loop(void *args)
{
@@ -1272,7 +1313,6 @@ static int run_benchmark(int async_jobs,
int speed_main(int argc, char **argv)
{
ENGINE *e = NULL;
- int (*loopfunc)(void *args);
loopargs_t *loopargs = NULL;
const char *prog;
const char *engine_id = NULL;
@@ -1281,7 +1321,7 @@ int speed_main(int argc, char **argv)
OPTION_CHOICE o;
int async_init = 0, multiblock = 0, pr_header = 0;
int doit[ALGOR_NUM] = { 0 };
- int ret = 1, misalign = 0, lengths_single = 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;
@@ -1517,6 +1557,9 @@ int speed_main(int argc, char **argv)
lengths = &lengths_single;
size_num = 1;
break;
+ case OPT_AEAD:
+ aead = 1;
+ break;
}
}
argc = opt_num_rest();
@@ -1596,6 +1639,34 @@ int speed_main(int argc, char **argv)
goto end;
}
+ /* Sanity checks */
+ if (aead) {
+ if (evp_cipher == NULL) {
+ BIO_printf(bio_err, "-aead can be used only with an AEAD cipher\n");
+ goto end;
+ } else if (!(EVP_CIPHER_flags(evp_cipher) &
+ EVP_CIPH_FLAG_AEAD_CIPHER)) {
+ BIO_printf(bio_err, "%s is not an AEAD cipher\n",
+ OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)));
+ goto end;
+ }
+ }
+ if (multiblock) {
+ if (evp_cipher == NULL) {
+ BIO_printf(bio_err,"-mb can be used only with a multi-block"
+ " capable cipher\n");
+ goto end;
+ } else if (!(EVP_CIPHER_flags(evp_cipher) &
+ EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+ BIO_printf(bio_err, "%s is not a multi-block capable\n",
+ OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)));
+ goto end;
+ } else if (async_jobs > 0) {
+ BIO_printf(bio_err, "Async mode is not supported with -mb");
+ goto end;
+ }
+ }
+
/* Initialize the job pool if async mode is enabled */
if (async_jobs > 0) {
async_init = ASYNC_init_thread(async_jobs, async_jobs);
@@ -1619,7 +1690,10 @@ int speed_main(int argc, char **argv)
}
}
- buflen = lengths[size_num - 1] + MAX_MISALIGNMENT + 1;
+ buflen = lengths[size_num - 1];
+ if (buflen < 36) /* size of random vector in RSA bencmark */
+ buflen = 36;
+ buflen += MAX_MISALIGNMENT + 1;
loopargs[i].buf_malloc = app_malloc(buflen, "input buffer");
loopargs[i].buf2_malloc = app_malloc(buflen, "input buffer");
memset(loopargs[i].buf_malloc, 0, buflen);
@@ -1961,10 +2035,8 @@ int speed_main(int argc, char **argv)
/* not worth fixing */
# error "You cannot disable DES on systems without SIGALRM."
# endif /* OPENSSL_NO_DES */
-#else
-# ifndef _WIN32
- signal(SIGALRM, sig_done);
-# endif
+#elif SIGALRM > 0
+ signal(SIGALRM, alarmed);
#endif /* SIGALRM */
#ifndef OPENSSL_NO_MD2
@@ -2420,30 +2492,30 @@ int speed_main(int argc, char **argv)
}
if (doit[D_EVP]) {
- if (multiblock && evp_cipher) {
- if (!
- (EVP_CIPHER_flags(evp_cipher) &
- EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
- BIO_printf(bio_err, "%s is not multi-block capable\n",
- OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)));
+ if (evp_cipher != NULL) {
+ int (*loopfunc)(void *args) = EVP_Update_loop;
+
+ if (multiblock && (EVP_CIPHER_flags(evp_cipher) &
+ EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+ multiblock_speed(evp_cipher, lengths_single, &seconds);
+ ret = 0;
goto end;
}
- if (async_jobs > 0) {
- BIO_printf(bio_err, "Async mode is not supported, exiting...");
- exit(1);
+
+ names[D_EVP] = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher));
+
+ if (EVP_CIPHER_mode(evp_cipher) == EVP_CIPH_CCM_MODE) {
+ loopfunc = EVP_Update_loop_ccm;
+ } else if (aead && (EVP_CIPHER_flags(evp_cipher) &
+ EVP_CIPH_FLAG_AEAD_CIPHER)) {
+ loopfunc = EVP_Update_loop_aead;
+ if (lengths == lengths_list) {
+ lengths = aead_lengths_list;
+ size_num = OSSL_NELEM(aead_lengths_list);
+ }
}
- multiblock_speed(evp_cipher, lengths_single, &seconds);
- ret = 0;
- goto end;
- }
- for (testnum = 0; testnum < size_num; testnum++) {
- if (evp_cipher) {
- names[D_EVP] = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher));
- /*
- * -O3 -fschedule-insns messes up an optimization here!
- * names[D_EVP] somehow becomes NULL
- */
+ for (testnum = 0; testnum < size_num; testnum++) {
print_message(names[D_EVP], save_count, lengths[testnum],
seconds.sym);
@@ -2461,13 +2533,6 @@ int speed_main(int argc, char **argv)
loopargs[k].key, NULL, -1);
OPENSSL_clear_free(loopargs[k].key, keylen);
}
- switch (EVP_CIPHER_mode(evp_cipher)) {
- case EVP_CIPH_CCM_MODE:
- loopfunc = EVP_Update_loop_ccm;
- break;
- default:
- loopfunc = EVP_Update_loop;
- }
Time_F(START);
count = run_benchmark(async_jobs, loopfunc, loopargs);
@@ -2475,16 +2540,19 @@ int speed_main(int argc, char **argv)
for (k = 0; k < loopargs_len; k++) {
EVP_CIPHER_CTX_free(loopargs[k].ctx);
}
+ print_result(D_EVP, testnum, count, d);
}
- if (evp_md) {
- names[D_EVP] = OBJ_nid2ln(EVP_MD_type(evp_md));
+ } else if (evp_md != NULL) {
+ 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],
seconds.sym);
Time_F(START);
count = run_benchmark(async_jobs, EVP_Digest_loop, loopargs);
d = Time_F(STOP);
+ print_result(D_EVP, testnum, count, d);
}
- print_result(D_EVP, testnum, count, d);
}
}
diff --git a/doc/man1/speed.pod b/doc/man1/speed.pod
index 4f46fac..523da0d 100644
--- a/doc/man1/speed.pod
+++ b/doc/man1/speed.pod
@@ -16,6 +16,8 @@ B<openssl speed>
[B<-rand file...>]
[B<-writerand file>]
[B<-primes num>]
+[B<-seconds num>]
+[B<-bytes num>]
[B<algorithm...>]
=head1 DESCRIPTION
@@ -42,12 +44,16 @@ for all available algorithms.
=item B<-elapsed>
-Measure time in real time instead of CPU time. It can be useful when testing
-speed of hardware engines.
+When calculating operations- or bytes-per-second, use wall-clock time
+instead of CPU user time as divisor. It can be useful when testing speed
+of hardware engines.
=item B<-evp algo>
Use the specified cipher or message digest algorithm via the EVP interface.
+If B<algo> is an AEAD cipher, then you can pass <-aead> to benchmark a
+TLS-like sequence. And if B<algo> is a multi-buffer capable cipher, e.g.
+aes-128-cbc-hmac-sha1, then B<-mb> will time multi-buffer operation.
=item B<-decrypt>
@@ -81,8 +87,8 @@ Run benchmarks on B<num>-byte buffers. Affects ciphers, digests and the CSPRNG.
=item B<[zero or more test algorithms]>
-If any options are given, B<speed> tests those algorithms, otherwise all of
-the above are tested.
+If any options are given, B<speed> tests those algorithms, otherwise a
+pre-compiled grand selection is tested.
=back
More information about the openssl-commits
mailing list