Merge remote-tracking branch 'upstream/llvm-3.4' into llvm-3.4

Author: yag00

lib/Transforms/Obfuscation/PrngAESCtr.cpp

@@ -32,6 +32,11 @@
 #include <cstring>
 #include <cstdio>
 
+#if defined(_WIN32)
+   #include <windows.h>
+   #include <wincrypt.h>
+#endif
+
 // Stats
 STATISTIC(statsGetBytes,  "a. Number of calls to get_bytes ()");
 STATISTIC(statsGetChar,   "b. Number of calls to get_char ()");
@@ -747,35 +752,51 @@ void PrngAESCtr::populate_pool () {
 }
 
 void PrngAESCtr::prng_seed () {
-#if defined(__linux__)
-    std::ifstream devrandom ("/dev/urandom");
+
+  LLVMContext &ctx = llvm::getGlobalContext();
+
+#if defined(_WIN32)
+       HCRYPTPROV hProvider = 0;
+
+       if (!::CryptAcquireContextW(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {
+               ctx.emitError(Twine("Cannot acquire cryptographic context"));
+       }
+               
+       if (!::CryptGenRandom(hProvider, 16, (unsigned char*)key))
+       {
+               ::CryptReleaseContext(hProvider, 0);
+               ctx.emitError(Twine("Cannot generate random"));
+       }
+
+       if (!::CryptReleaseContext(hProvider, 0)) {
+               ctx.emitError(Twine("Cannot release cryptographic context"));
+       }
+       
+       DEBUG_WITH_TYPE("cprng", dbgs() << "CPNRG seeded with Windows cryptographic API");
 #else
-    std::ifstream devrandom ("/dev/random");
-#endif 
-    
-    LLVMContext &ctx = llvm::getGlobalContext();
-    
+    std::ifstream devrandom ("/dev/urandom");
+
     if (devrandom) {
 
         devrandom.read (key, 16);
 
         if (devrandom.gcount() != 16) {
-            ctx.emitError ( Twine("Cannot read enough bytes in /dev/random"));
+            ctx.emitError ( Twine("Cannot read enough bytes in /dev/urandom"));
         }
 
         devrandom.close();
-        DEBUG_WITH_TYPE ("cprng", dbgs() << "CPNRG seeded with /dev/random");
-
-        memset(ctr, 0, 16);
-        
-        // Once the seed is there, we compute the
-        // AES128 key-schedule
-        aes_compute_ks(ks, key);
-        
-        seeded = true;
     } else {
-        ctx.emitError (Twine ("Cannot open /dev/random"));
+        ctx.emitError (Twine ("Cannot open /dev/urandom"));
     }
+#endif
+
+    memset(ctr, 0, 16);
+    
+    // Once the seed is there, we compute the
+    // AES128 key-schedule
+    aes_compute_ks(ks, key);
+
+    seeded = true;
 }
 
 void PrngAESCtr::inc_ctr() {

tools/clang/include/clang/Driver/Options.td

@@ -973,7 +973,7 @@ def mios_simulator_version_min_EQ : Joined<["-"], "mios-simulator-version-min=">
 def mkernel : Flag<["-"], "mkernel">, Group<m_Group>;
 def mlinker_version_EQ : Joined<["-"], "mlinker-version=">,
   Flags<[DriverOption]>;
-def mllvm : Separate<["-"], "mllvm">, Flags<[CC1Option]>,
+def mllvm : Separate<["-"], "mllvm">, Flags<[DriverOption,CC1Option]>,
   HelpText<"Additional arguments to forward to LLVM's option processing">;
 def mmacosx_version_min_EQ : Joined<["-"], "mmacosx-version-min=">, Group<m_Group>;
 def mms_bitfields : Flag<["-"], "mms-bitfields">, Group<m_Group>, Flags<[CC1Option]>,