File hardening_for_RNG_code.patch of Package bolt

Overview Repositories Revisions Requests Users Attributes Meta

File hardening_for_RNG_code.patch of Package bolt (Revision 698767b99be785aad30930374aa1bf7b)

Currently displaying revision 698767b99be785aad30930374aa1bf7b , Show latest

--- bolt-0.6/common/bolt-rnd.c	
+++ bolt-0.6/common/bolt-rnd.c	
@@ -38,7 +38,7 @@ bolt_get_random_data (void *buf, gsize n
 {
   gboolean ok;
 
-  ok = bolt_random_getrandom (buf, n, GRND_NONBLOCK, NULL);
+  ok = bolt_random_getrandom (buf, n, 0, NULL);
   if (ok)
     return BOLT_RNG_GETRANDOM;
 
@@ -47,8 +47,7 @@ bolt_get_random_data (void *buf, gsize n
   if (ok)
     return BOLT_RNG_URANDOM;
 
-  bolt_random_prng (buf, n);
-  return BOLT_RNG_PRNG;
+  return BOLT_RNG_ERROR;
 }
 
 /* specific implementations */
--- bolt-0.6/boltd/bolt-device.c	
+++ bolt-0.6/boltd/bolt-device.c	
@@ -1072,7 +1072,15 @@ handle_authorize (BoltExported
       if (dev->key)
         key = bolt_store_get_key (dev->store, dev->uid, error);
       else if (device_should_uprade_key (dev))
+      {
         key = bolt_key_new ();
+        if (!key)
+        {
+          g_set_error (error, BOLT_ERROR, BOLT_ERROR_FAILED,
+                  "failed to generate random key");
+	  return NULL;
+        }
+      }
       else
         level = BOLT_SECURITY_USER;
     }
--- bolt-0.6/boltd/bolt-key.c	
+++ bolt-0.6/boltd/bolt-key.c	
@@ -147,10 +147,18 @@ bolt_key_new (void)
 {
   BoltKey *key;
   char data[BOLT_KEY_BYTES];
+  BoltRng rng_res = BOLT_RNG_ERROR;
 
   key = g_object_new (BOLT_TYPE_KEY, NULL);
 
-  bolt_get_random_data (data, BOLT_KEY_BYTES);
+  rng_res = bolt_get_random_data (data, BOLT_KEY_BYTES);
+
+  if (rng_res == BOLT_RNG_ERROR)
+  {
+    g_object_unref(key);
+    return NULL;
+  }
+
 
   for (guint i = 0; i < BOLT_KEY_BYTES; i++)
     {
--- bolt-0.6/boltd/bolt-manager.c	
+++ bolt-0.6/boltd/bolt-manager.c	
@@ -2273,7 +2273,15 @@ handle_enroll_device (BoltExported
 
   key = NULL;
   if (level == BOLT_SECURITY_SECURE)
+  {
     key = bolt_key_new ();
+    if (!key)
+    {
+      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+              "failed to generate random key");
+      return NULL;
+    }
+  }
 
   auth = bolt_auth_new (mgr, level, key);
   bolt_device_authorize (dev, auth, enroll_device_done, inv);

Places

File hardening_for_RNG_code.patch of Package bolt (Revision 698767b99be785aad30930374aa1bf7b)

Places