Check rng return value when generating serial numbers in pki utility

diff --git a/src/pki/commands/issue.c b/src/pki/commands/issue.c
index 0398c9dc94e478d2c89b6af6a3a8d23fd87f44f7..4dbe2e0699873be5f5396af154b2c847bcb5a31a 100644 (file)
--- a/src/pki/commands/issue.c
+++ b/src/pki/commands/issue.c
@@ -356,11 +356,11 @@ static int issue()
                        error = "no random number generator found";
                        goto end;
                }
-               rng->allocate_bytes(rng, 8, &serial);
-               while (*serial.ptr == 0x00)
+               if (!rng_allocate_bytes_not_zero(rng, 8, &serial, FALSE))
                {
-                       /* we don't accept a serial number with leading zeroes */
-                       rng->get_bytes(rng, 1, serial.ptr);
+                       error = "failed to generate serial number";
+                       rng->destroy(rng);
+                       goto end;
                }
                rng->destroy(rng);
        }

diff --git a/src/pki/commands/self.c b/src/pki/commands/self.c
index 6813c98f755b7c82d357fa7056097c88fbbaeff9..e98f90f4e5d48f1ff54f3713efe399124d87a242 100644 (file)
--- a/src/pki/commands/self.c
+++ b/src/pki/commands/self.c
@@ -298,11 +298,11 @@ static int self()
                        error = "no random number generator found";
                        goto end;
                }
-               rng->allocate_bytes(rng, 8, &serial);
-               while (*serial.ptr == 0x00)
+               if (!rng_allocate_bytes_not_zero(rng, 8, &serial, FALSE))
                {
-                       /* we don't accept a serial number with leading zeroes */
-                       rng->get_bytes(rng, 1, serial.ptr);
+                       error = "failed to generate serial number";
+                       rng->destroy(rng);
+                       goto end;
                }
                rng->destroy(rng);
        }