Eliminate bogus #if WCEPLATFORM!=MS_HPC_PRO [which by the way unconditionally
authorAndy Polyakov <appro@openssl.org>
Tue, 2 Aug 2005 11:58:39 +0000 (11:58 +0000)
committerAndy Polyakov <appro@openssl.org>
Tue, 2 Aug 2005 11:58:39 +0000 (11:58 +0000)
invalidated the whole clause] and replace it with #if _WIN32_WCE>=210.

crypto/rand/rand_win.c
util/pl/VC-32.pl

index 47bf758..e609cc1 100644 (file)
@@ -217,21 +217,22 @@ int RAND_poll(void)
         osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
         GetVersionEx( &osverinfo ) ;
 
-#if defined(OPENSSL_SYS_WINCE) && WCEPLATFORM!=MS_HPC_PRO
-#ifndef CryptAcquireContext
-#define CryptAcquireContext CryptAcquireContextW
-#endif
+#if defined(OPENSSL_SYS_WINCE)
+# if defined(_WIN32_WCE) && _WIN32_WCE>=210
+# ifndef CryptAcquireContext
+   /* reserve for broken header... */
+#  define CryptAcquireContext CryptAcquireContextW
+# endif
        /* poll the CryptoAPI PRNG */
        /* The CryptoAPI returns sizeof(buf) bytes of randomness */
-       if (CryptAcquireContext(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+       if (CryptAcquireContext(&hProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
                {
                if (CryptGenRandom(hProvider, sizeof(buf), buf))
                        RAND_add(buf, sizeof(buf), sizeof(buf));
                CryptReleaseContext(hProvider, 0); 
                }
-#endif
-
-#ifndef OPENSSL_SYS_WINCE
+# endif
+#else  /* OPENSSL_SYS_WINCE */
        /*
         * None of below libraries are present on Windows CE, which is
         * why we #ifndef the whole section. This also excuses us from
@@ -361,7 +362,7 @@ int RAND_poll(void)
                {
                /* poll the CryptoAPI PRNG */
                 /* The CryptoAPI returns sizeof(buf) bytes of randomness */
-               if (acquire(&hProvider, 0, 0, PROV_RSA_FULL,
+               if (acquire(&hProvider, NULL, NULL, PROV_RSA_FULL,
                        CRYPT_VERIFYCONTEXT))
                        {
                        if (gen(hProvider, sizeof(buf), buf) != 0)
index 7aedfce..81802af 100644 (file)
@@ -48,7 +48,7 @@ elsif ($FLAVOR =~ /CE/)
     {  $wcelflag .= " /machine:$ENV{'TARGETCPU'}";     }
     $wceplatf =  $ENV{'PLATFORM'};
     $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
-    $wcecdefs .= " -DWCEPLATFORM=$wceplatf";
+    $wcecdefs .= " -DWCE_$wceplatf";
 
     $cc='$(CC)';
     $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
@@ -95,7 +95,7 @@ else                  { $ex_libs='wsock32.lib'; }
 
 if ($FLAVOR =~ /CE/)
        {
-       $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib';
+       $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib cryptapi.lib';
        $ex_libs.=' /nodefaultlib:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
        }
 else