apps/speed.c: add -aead flag. #6311
Conversation
Goal is to exercise AEAD ciphers in TLS-like sequence, i.e. 13-byte AAD followed by payload. [While we are at it, address even some styling issues.]
|
I had a brainslip, pushed update... |
|
Red cross from travis is unrelated, and [should be] addressed in #6315. |
|
|
||
| if (EVP_CIPHER_mode(evp_cipher) == EVP_CIPH_CCM_MODE) { | ||
| loopfunc = EVP_Update_loop_ccm; | ||
| } else if (aead && (EVP_CIPHER_flags(evp_cipher) & |
There was a problem hiding this comment.
Why not apply this to every cipher having EVP_CIPH_FLAG_AEAD_CIPHER flag ?
There was a problem hiding this comment.
Yes, I considered this. Trouble is that those who want to profile low-level subroutines would prefer the original behaviour. So there would be additional flag either way. Being conservative in minor release is more appropriate, i.e. it's more appropriate to engage new behaviour with additional flag and not vice versa.
apps/speed.c
Outdated
| @@ -327,6 +328,8 @@ const OPTIONS speed_options[] = { | |||
| "Run benchmarks for pnum seconds"}, | |||
| {"bytes", OPT_BYTES, 'p', | |||
| "Run cipher, digest and rand benchmarks on pnum bytes"}, | |||
| {"aead", OPT_AEAD, '-', | |||
There was a problem hiding this comment.
this flag must be used in conjonction with -evp , isn't it ?
There was a problem hiding this comment.
Not only that, but with cipher. I mean -evp can denote digest as well. Yeah, maybe sanity check with an error message would be appropriate...
There was a problem hiding this comment.
I suggest to take inspiration on the 'mb' option, a few lines above ::
{"mb", OPT_MB, '-',
"Enable (tls1.1) multi-block mode on evp_cipher requested with -evp"},
apps/speed.c
Outdated
| @@ -948,6 +951,41 @@ static int EVP_Update_loop_ccm(void *args) | |||
| } | |||
| return count; | |||
| } | |||
| /* | |||
There was a problem hiding this comment.
style : add a blank line to mark separation ?
man1/speed.pod: mention -aead and -mb flags
…r [to be squashed].
dot-asm
dismissed
t-j-h’s stale review
I didmiss review as ping. I mean there were non-commentary updates past point of approval, and they wer not re-approved.
|
@dot-asm this seems ready to be committed |
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from openssl#6311)
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@openssl.org> (Merged from openssl#6311)
…ign. Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from openssl#6311)
Goal is to exercise AEAD ciphers in TLS-like sequence, i.e. 13-byte
AAD followed by payload.
[While we are at it, address even some styling issues.]