make WIN32 compile work again
authorDr. Stephen Henson <steve@openssl.org>
Thu, 8 Jul 2010 01:23:25 +0000 (01:23 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 8 Jul 2010 01:23:25 +0000 (01:23 +0000)
apps/s_socket.c
apps/speed.c

index 2a57577b09258b1cd7b948fd1920a9afefed67a5..6d1d7d749d5d8d1dca3d172130d32da68de22bc7 100644 (file)
@@ -408,6 +408,7 @@ redoit:
        if (ret == INVALID_SOCKET)
                {
 #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+               int i;
                i=WSAGetLastError();
                BIO_printf(bio_err,"accept error %d\n",i);
 #else
index d206c96e29a3a5fdd9edbd6a5f62e8c69626591c..84ce35dbd161bac8d07577040c9ac14d8004c1d1 100644 (file)
@@ -1381,7 +1381,8 @@ int MAIN(int argc, char **argv)
                count*=2;
                Time_F(START);
                for (it=count; it; it--)
-                       DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
+                       DES_ecb_encrypt((DES_cblock *)buf,
+                               (DES_cblock *)buf,
                                &sch,DES_ENCRYPT);
                d=Time_F(STOP);
                } while (d <3);