5 files changed, 32 insertions, 10 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 6e60718ee..e1337318e 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -117,15 +117,14 @@
 
 /*
 * Specifies (in order) the list of entropy sources that will be used
-* to seed an in-memory RNG. The first in the default list: "rdseed" and "rdrand"
-* do not count as contributing any entropy
-* but are included as they are fast and help protect against a
-* seriously broken system RNG.
+* to seed an in-memory RNG. The first in the default list: "rdseed"
+* and "rdrand" do not count as contributing any entropy but are
+* included as they are fast and help protect against a seriously
+* broken system RNG.
 */
 #define BOTAN_ENTROPY_DEFAULT_SOURCES \
-   { "rdseed", "rdrand", "darwin_secrandom", "getentropy", "dev_random", \
-    "win32_cryptoapi", "proc_walk", "system_stats" }
-
+   { "rdseed", "rdrand", "darwin_secrandom", "getentropy", \
+     "dev_random", "system_rng", "proc_walk", "system_stats" }
 
 /* Multiplier on a block cipher's native parallelism */
 #define BOTAN_BLOCK_CIPHER_PAR_MULT 4
diff --git a/src/build-data/os/winphone.txt b/src/build-data/os/winphone.txt
new file mode 100644
index 000000000..ee43ee702
--- /dev/null
+++ b/src/build-data/os/winphone.txt
@@ -0,0 +1,26 @@
+os_type windows
+
+# ?
+program_suffix .exe
+obj_suffix obj
+static_suffix lib
+building_shared_supported no
+
+install_root c:\\Botan
+doc_dir docs
+
+install_cmd_data "copy"
+install_cmd_exec "copy"
+
+<target_features>
+crypto_ng
+gmtime_s
+loadlibrary
+mkgmtime
+query_perf_counter
+rtlsecurezeromemory
+#stl_filesystem_msvc
+threads
+filesystem
+sockets
+</target_features>
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt
index 0f053c337..f66f634ed 100644
--- a/src/build-data/policy/bsi.txt
+++ b/src/build-data/policy/bsi.txt
@@ -57,7 +57,6 @@ aes_ssse3
 clmul
 
 # entropy sources
-cryptoapi_rng
 darwin_secrandom
 dev_random
 proc_walk
diff --git a/src/build-data/policy/modern.txt b/src/build-data/policy/modern.txt
index 588fc7fc8..fb435636c 100644
--- a/src/build-data/policy/modern.txt
+++ b/src/build-data/policy/modern.txt
@@ -76,7 +76,6 @@ rdrand_rng
 system_rng
 
 # entropy sources
-cryptoapi_rng
 darwin_secrandom
 dev_random
 proc_walk
diff --git a/src/build-data/policy/nist.txt b/src/build-data/policy/nist.txt
index 50948d4dc..ad7a552dc 100644
--- a/src/build-data/policy/nist.txt
+++ b/src/build-data/policy/nist.txt
@@ -61,7 +61,6 @@ sha2_32_armv8
 clmul
 
 # entropy sources
-cryptoapi_rng
 darwin_secrandom
 dev_random
 proc_walk