sync code from standard to lite.

Signed-off-by: Nmaoyufeng <maoyufeng3@huawei.com>

wpa_supplicant-2.9/src/common/wpa_ctrl.c

@@ -391,7 +391,7 @@ struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path)
 	ctrl->dest.sin_port = htons(WPA_CTRL_IFACE_PORT);
 #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
 
-#ifdef CONFIG_OPEN_HARMONY_PATCH | CONFIG_OPEN_HARMONY_PATCH_LITE
+#if defined(CONFIG_OPEN_HARMONY_PATCH) || defined(CONFIG_OPEN_HARMONY_PATCH_LITE)
 	if (wpa_ctrl_port(ctrl_path, ctrl) < 0) {
 		wpa_printf(MSG_ERROR, "get port fail");
 	}

wpa_supplicant-2.9/src/utils/os_internal.c

@@ -123,6 +123,13 @@ void os_daemonize_terminate(const char *pid_file)
 
 int os_get_random(unsigned char *buf, size_t len)
 {
+#if defined(TEST_FUZZ) || defined(CONFIG_TEST_RANDOM)
+  size_t i;
+
+  for (i = 0; i < len; i++)
+    buf[i] = i & 0xff;
+  return 0;
+#else /* TEST_FUZZ */
 	FILE *f;
 	size_t rc;
 
@@ -136,6 +143,7 @@ int os_get_random(unsigned char *buf, size_t len)
 	fclose(f);
 
 	return rc != len ? -1 : 0;
+#endif
 }
 
 

wpa_supplicant-2.9/src/utils/os_unix.c

@@ -250,7 +250,7 @@ void os_daemonize_terminate(const char *pid_file)
 
 int os_get_random(unsigned char *buf, size_t len)
 {
-#ifdef TEST_FUZZ
+#if defined(TEST_FUZZ) || defined(CONFIG_TEST_RANDOM)
 	size_t i;
 
 	for (i = 0; i < len; i++)

wpa_supplicant-2.9_standard/src/common/wpa_ctrl.c

@@ -391,7 +391,7 @@ struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path)
 	ctrl->dest.sin_port = htons(WPA_CTRL_IFACE_PORT);
 #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
 
-#ifdef CONFIG_OPEN_HARMONY_PATCH | CONFIG_OPEN_HARMONY_PATCH_LITE
+#if defined(CONFIG_OPEN_HARMONY_PATCH) || defined(CONFIG_OPEN_HARMONY_PATCH_LITE)
 	if (wpa_ctrl_port(ctrl_path, ctrl) < 0) {
 		wpa_printf(MSG_ERROR, "get port fail");
 	}

wpa_supplicant-2.9_standard/src/utils/os_internal.c

@@ -123,6 +123,13 @@ void os_daemonize_terminate(const char *pid_file)
 
 int os_get_random(unsigned char *buf, size_t len)
 {
+#if defined(TEST_FUZZ) || defined(CONFIG_TEST_RANDOM)
+  size_t i;
+
+  for (i = 0; i < len; i++)
+    buf[i] = i & 0xff;
+  return 0;
+#else /* TEST_FUZZ */
 	FILE *f;
 	size_t rc;
 
@@ -136,6 +143,7 @@ int os_get_random(unsigned char *buf, size_t len)
 	fclose(f);
 
 	return rc != len ? -1 : 0;
+#endif
 }
 
 

wpa_supplicant-2.9_standard/src/utils/os_unix.c

@@ -250,7 +250,7 @@ void os_daemonize_terminate(const char *pid_file)
 
 int os_get_random(unsigned char *buf, size_t len)
 {
-#ifdef TEST_FUZZ
+#if defined(TEST_FUZZ) || defined(CONFIG_TEST_RANDOM)
 	size_t i;
 
 	for (i = 0; i < len; i++)