Make the script a little more location agnostic

[openssl.git] / apps / speed.c

diff --git a/apps/speed.c b/apps/speed.c
index 53d6bc58bde7cac096306ba97e5513c16ceab15c..6ee5d4033b3d0eae3c6c292eb6533abc4bff02ce 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -225,7 +225,7 @@
 
 #undef BUFSIZE
 #define BUFSIZE        ((long)1024*8+1)
-int run=0;
+static volatile int run=0;
 
 static int mr=0;
 static int usertime=1;
@@ -2747,27 +2747,6 @@ static int do_multi(int multi)
                                k=atoi(sstrsep(&p,sep));
                                sstrsep(&p,sep);
 
-                               d=atof(sstrsep(&p,sep));
-                               if(n)
-                                       rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
-                               else
-                                       rsa_results[k][0]=d;
-
-                               d=atof(sstrsep(&p,sep));
-                               if(n)
-                                       rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
-                               else
-                                       rsa_results[k][1]=d;
-                               }
-                       else if(!strncmp(buf,"+F2:",4))
-                               {
-                               int k;
-                               double d;
-                               
-                               p=buf+4;
-                               k=atoi(sstrsep(&p,sep));
-                               sstrsep(&p,sep);
-
                                d=atof(sstrsep(&p,sep));
                                if(n)
                                        rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);
@@ -2884,14 +2863,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;