Changeset 87337dc5 in mainline for uspace/app/mkexfat/mkexfat.c

Timestamp:

2018-07-09T15:00:24Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d054ad3

Parents:

914c693

git-author:

Jiri Svoboda <jiri@…> (2018-07-08 19:58:56)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-09 15:00:24)

Message:

Random number generator interface. FAT and exFAT should be created with random volume serial numbers.

File:

• uspace/app/mkexfat/mkexfat.c (modified) (5 diffs)

uspace/app/mkexfat/mkexfat.c

@@ -46 +46 @@
 #include <byteorder.h>
 #include <align.h>
+#include <rndgen.h>
 #include <str.h>
 #include <getopt.h>
@@ -243 +244 @@
  * @param mbs Pointer to the Main Boot Sector structure.
  * @param cfg Pointer to the exFAT configuration structure.
- * @return    Initial checksum value.
+ * @param chksum Place to store initial checksum value.
+ * @return EOK on success or error code
  */
 static uint32_t
-vbr_initialize(exfat_bs_t *mbs, exfat_cfg_t *cfg)
-{
+vbr_initialize(exfat_bs_t *mbs, exfat_cfg_t *cfg, uint32_t *chksum)
+{
+        rndgen_t *rndgen;
+        errno_t rc;
+        uint32_t vsn;
+
+        /* Generate volume serial number */
+
+        rc = rndgen_create(&rndgen);
+        if (rc != EOK)
+                return rc;
+
+        rc = rndgen_uint32(rndgen, &vsn);
+        if (rc != EOK) {
+                rndgen_destroy(rndgen);
+                return rc;
+        }
+
+        rndgen_destroy(rndgen);
+
         /* Fill the structure with zeroes */
         memset(mbs, 0, sizeof(exfat_bs_t));
@@ -268 +288 @@
 
         mbs->rootdir_cluster = host2uint32_t_le(cfg->rootdir_cluster);
-        mbs->volume_serial = host2uint32_t_le(0xe1028172);
+        mbs->volume_serial = host2uint32_t_le(vsn);
         mbs->version.major = 1;
         mbs->version.minor = 0;
@@ -283 +303 @@
         mbs->signature = host2uint16_t_le(0xAA55);
 
-        return vbr_checksum_start(mbs, sizeof(exfat_bs_t));
+        *chksum = vbr_checksum_start(mbs, sizeof(exfat_bs_t));
+        return EOK;
 }
 
@@ -299 +320 @@
                 return ENOMEM;
 
-        vbr_checksum = vbr_initialize(&mbs, cfg);
+        rc = vbr_initialize(&mbs, cfg, &vbr_checksum);
+        if (rc != EOK)
+                goto exit;
 
         /* Write the Main Boot Sector to disk */