Changeset 5261 for pjproject/trunk/third_party/srtp/crypto/rng/rand_source.c

Timestamp:

Mar 15, 2016 3:57:39 AM (8 years ago)

Author:

nanang

Message:

Close #1847: Upgraded libsrtp version to 1.5.4 and added support for AES-CM-256 crypto.

File:

• pjproject/trunk/third_party/srtp/crypto/rng/rand_source.c (modified) (4 diffs)

pjproject/trunk/third_party/srtp/crypto/rng/rand_source.c

@@ -43 +43 @@
  */
 
-#include "srtp_config.h"
+#include "config.h"
 
-#if defined(DEV_URANDOM) || defined(PJ_DEV_URANDOM)
+#ifdef DEV_URANDOM
 # include <fcntl.h>          /* for open()  */
 # include <unistd.h>         /* for close() */
-#elif (_MSC_VER >= 1400)
-#define _CRT_RAND_S
+#elif defined(HAVE_RAND_S)
+# define _CRT_RAND_S
 # include <stdlib.h>         
-# include <stdio.h>
 #else
 # include <stdio.h>
@@ -88 +87 @@
   if (dev_random_fdes < 0)
     return err_status_init_fail;
-#elif defined(PJ_DEV_URANDOM)
-  /* open random source for reading */
-  dev_random_fdes = open(PJ_DEV_URANDOM, O_RDONLY);
-  if (dev_random_fdes < 0) {
-    err_report(3,"Ugh: /dev/urandom not present, using rand() instead");
-    return err_status_ok;  /* it's ok, it'll fallback to using rand() */
-  }
-#elif (_MSC_VER >= 1400)
+#elif defined(HAVE_RAND_S)
   dev_random_fdes = RAND_SOURCE_READY;
 #else
   /* no random source available; let the user know */
-  err_report(err_level_info, "WARNING: no real random source present!\n");
+  fprintf(stderr, "WARNING: no real random source present!\n");
   dev_random_fdes = RAND_SOURCE_READY;
 #endif
@@ -114 +106 @@
    */
 #ifdef DEV_URANDOM
-  if (read(dev_random_fdes, dest, len) != len)
-    return err_status_fail;
-#elif 0 && (_MSC_VER >= 1400) /* disabled rand_s, causing assertion 'rand_s not supported' in vs8 */
-  unsigned int *dst = dest;
+  uint8_t *dst = (uint8_t *)dest;
   while (len)
   {
-      unsigned int val = 0;
-          errno_t err = rand_s(&val);
-      if (err != 0)
-              {
-              return err_status_fail;
-          }
+    ssize_t num_read = read(dev_random_fdes, dst, len);
+    if (num_read <= 0 || num_read > len)
+      return err_status_fail;
+    len -= num_read;
+    dst += num_read;
+  }
+#elif defined(HAVE_RAND_S)
+  uint8_t *dst = (uint8_t *)dest;
+  while (len)
+  {
+    unsigned int val;
+    errno_t err = rand_s(&val);
+
+    if (err != 0)
+      return err_status_fail;
   
-      *dst++ = val;
-          len--;
+    *dst++ = val & 0xff;
+    len--;
   }
 #else
-  uint8_t *dst = (uint8_t *)dest;
-
-#ifdef PJ_DEV_URANDOM
-  /* First try with /dev/urandom, if it's opened */
-  if (dev_random_fdes >= 0) {
-    if (read(dev_random_fdes, dest, len) == len)
-        return err_status_ok;   /* success */
-  }
-#endif
-
   /* Generic C-library (rand()) version */
   /* This is a random source of last resort */
+  uint8_t *dst = (uint8_t *)dest;
   while (len)
   {
@@ -158 +147 @@
 err_status_t
 rand_source_deinit(void) {
-#ifndef PJ_DEV_URANDOM
   if (dev_random_fdes < 0)
     return err_status_dealloc_fail;  /* well, we haven't really failed, *
                                       * but there is something wrong    */
+#ifdef DEV_URANDOM
+  close(dev_random_fdes);  
 #endif
-
-#if defined(DEV_URANDOM) || defined(PJ_DEV_URANDOM)
-  if (dev_random_fdes >= 0)
-    close(dev_random_fdes);  
-
   dev_random_fdes = RAND_SOURCE_NOT_READY;
-#endif
   
   return err_status_ok;  
 }
-