small fix

ssl/statem/statem_clnt.c

@@ -2011,6 +2011,8 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
     size_t chainidx;
     unsigned int context = 0;
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
+
+    struct timeval tv1, tv2;
 
     struct timeval tv1, tv2;
 
@@ -2127,6 +2129,9 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
 
     if (s->ext.server_cert_type == TLSEXT_cert_type_rpk)
         return tls_post_process_server_rpk(s, wst);
+
+    struct timeval tv1, tv2;    
+    gettimeofday(&tv1, NULL);
 
     struct timeval tv1, tv2;    
     gettimeofday(&tv1, NULL);
@@ -2205,7 +2210,10 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
         /* SSLfatal() already called */;
         return WORK_ERROR;
     }
+<<<<<<< HEAD
 
+=======
+>>>>>>> cbff4726a429d8f044d9283005d81acafed282c5
     gettimeofday(&tv2, NULL);
     printf ("Total time process server cert = %f seconds\n\n",
                              (double) (tv2.tv_usec - tv1.tv_usec) / 1000000 +
@@ -3858,7 +3866,11 @@ CON_FUNC_RETURN tls_construct_client_certificate(SSL_CONNECTION *s,
     switch (s->ext.client_cert_type) {
 #ifndef OPENSSL_NO_VCAUTHTLS
     case TLSEXT_cert_type_vc:
+<<<<<<< HEAD
         gettimeofday(&tv1, NULL);
+=======
+    	gettimeofday(&tv1, NULL);
+>>>>>>> cbff4726a429d8f044d9283005d81acafed282c5
         if (!tls_output_vc(s, pkt, vcpk)) {
             /* SSLfatal() already called */
             return CON_FUNC_ERROR;