[vlc-devel] [PATCH] Implement vlc_rand_bytes() for OS/2
KO Myung-Hun
komh78 at gmail.com
Thu Dec 8 13:32:48 CET 2011
---
src/misc/rand.c | 97 +++++++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 42 deletions(-)
diff --git a/src/misc/rand.c b/src/misc/rand.c
index 3b84de6..038f79e 100644
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -26,7 +26,61 @@
#include <vlc_common.h>
#include <vlc_rand.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <wincrypt.h>
+
+void vlc_rand_bytes (void *buf, size_t len)
+{
+ HCRYPTPROV hProv;
+ size_t count = len;
+ uint8_t *p_buf = (uint8_t *)buf;
+
+ /* fill buffer with pseudo-random data */
+ while (count > 0)
+ {
+ unsigned int val;
+ val = rand();
+ if (count < sizeof (val))
+ {
+ memcpy (p_buf, &val, count);
+ break;
+ }
+
+ memcpy (p_buf, &val, sizeof (val));
+ count -= sizeof (val);
+ p_buf += sizeof (val);
+ }
+
+ /* acquire default encryption context */
+ if( CryptAcquireContext(
+ &hProv, // Variable to hold returned handle.
+ NULL, // Use default key container.
+ MS_DEF_PROV, // Use default CSP.
+ PROV_RSA_FULL, // Type of provider to acquire.
+ 0) )
+ {
+ /* fill buffer with pseudo-random data, intial buffer content
+ is used as auxillary random seed */
+ CryptGenRandom(hProv, len, buf);
+ CryptReleaseContext(hProv, 0);
+ }
+}
+
+#elif defined (__OS2__)
+void vlc_rand_bytes (void *buf, size_t len)
+{
+ QWORD qwTime;
+ uint8_t *p_buf = (uint8_t *)buf;
+
+ while (len > 0)
+ {
+ DosTmrQueryTime( &qwTime );
+
+ *p_buf++ = ( qwTime.ulLo * rand()) & 0xFF;
+ len--;
+ }
+}
+#else
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
@@ -121,47 +175,6 @@ void vlc_rand_bytes (void *buf, size_t len)
buf = ((uint8_t *)buf) + 16;
}
}
-
-#else /* WIN32 */
-
-#include <wincrypt.h>
-
-void vlc_rand_bytes (void *buf, size_t len)
-{
- HCRYPTPROV hProv;
- size_t count = len;
- uint8_t *p_buf = (uint8_t *)buf;
-
- /* fill buffer with pseudo-random data */
- while (count > 0)
- {
- unsigned int val;
- val = rand();
- if (count < sizeof (val))
- {
- memcpy (p_buf, &val, count);
- break;
- }
-
- memcpy (p_buf, &val, sizeof (val));
- count -= sizeof (val);
- p_buf += sizeof (val);
- }
-
- /* acquire default encryption context */
- if( CryptAcquireContext(
- &hProv, // Variable to hold returned handle.
- NULL, // Use default key container.
- MS_DEF_PROV, // Use default CSP.
- PROV_RSA_FULL, // Type of provider to acquire.
- 0) )
- {
- /* fill buffer with pseudo-random data, intial buffer content
- is used as auxillary random seed */
- CryptGenRandom(hProv, len, buf);
- CryptReleaseContext(hProv, 0);
- }
-}
#endif
static struct
--
1.7.3.2
More information about the vlc-devel
mailing list