summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-07-07 17:02:26 +0200
committerAndy Polyakov <appro@openssl.org>2014-07-07 17:03:27 +0200
commitde222838fe17a04b9694ad0e9c4604193c976fa7 (patch)
tree373c096145e5e50d883f2890c18ba416ecf42c72
parent0ad2a0a30354f34511498b727e4248eb3bb36ca1 (diff)
apps/speed.c: fix compiler warnings in multiblock_speed().
(cherry picked from commit c4f8efab34af95a5319bbc5b954b62614604298a)
-rw-r--r--apps/speed.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/speed.c b/apps/speed.c
index 53d6bc58bd..f7aba131fe 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2884,14 +2884,15 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher)
for (count=0,run=1; run && count<0x7fffffff; count++)
{
unsigned char aad[13];
- EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param = {NULL,aad,sizeof(aad),0};
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
size_t len = mblengths[j];
int packlen;
- aad[8] = 23;
- aad[9] = 3;
+ memset(aad,0,8);/* avoid uninitialized values */
+ aad[8] = 23; /* SSL3_RT_APPLICATION_DATA */
+ aad[9] = 3; /* version */
aad[10] = 2;
- aad[11] = 0;
+ aad[11] = 0; /* length */
aad[12] = 0;
mb_param.out = NULL;
mb_param.inp = aad;