diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2022-04-27 17:33:15 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2022-04-27 17:33:15 +0200 |
commit | c82a0cd2b06f768ec569c42bbde328b1cebc347e (patch) | |
tree | 51f7c288b3155b57f7fd848a15fb68f2c04f91cb | |
parent | 401356511c5de3b5a88fdd3ac4977e19b82babf5 (diff) | |
download | busybox-w32-c82a0cd2b06f768ec569c42bbde328b1cebc347e.tar.gz busybox-w32-c82a0cd2b06f768ec569c42bbde328b1cebc347e.tar.bz2 busybox-w32-c82a0cd2b06f768ec569c42bbde328b1cebc347e.zip |
seedrng: shorten strings
function old new delta
.rodata 104894 104876 -18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | util-linux/seedrng.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/util-linux/seedrng.c b/util-linux/seedrng.c index dd082ea90..441bb7b93 100644 --- a/util-linux/seedrng.c +++ b/util-linux/seedrng.c | |||
@@ -67,7 +67,7 @@ static size_t determine_optimal_seed_len(void) | |||
67 | 67 | ||
68 | n = open_read_close("/proc/sys/kernel/random/poolsize", poolsize_str, sizeof(poolsize_str) - 1); | 68 | n = open_read_close("/proc/sys/kernel/random/poolsize", poolsize_str, sizeof(poolsize_str) - 1); |
69 | if (n < 0) { | 69 | if (n < 0) { |
70 | bb_perror_msg("unable to determine pool size, assuming %u bits", MIN_SEED_LEN * 8); | 70 | bb_perror_msg("can't determine pool size, assuming %u bits", MIN_SEED_LEN * 8); |
71 | return MIN_SEED_LEN; | 71 | return MIN_SEED_LEN; |
72 | } | 72 | } |
73 | poolsize_str[n] = '\0'; | 73 | poolsize_str[n] = '\0'; |
@@ -139,11 +139,11 @@ static int seed_from_file_if_exists(const char *filename, int dfd, bool credit, | |||
139 | if (seed_len < 0) { | 139 | if (seed_len < 0) { |
140 | if (errno == ENOENT) | 140 | if (errno == ENOENT) |
141 | return 0; | 141 | return 0; |
142 | bb_perror_msg("unable to%s seed", " read"); | 142 | bb_perror_msg("can't%s seed", " read"); |
143 | return -1; | 143 | return -1; |
144 | } | 144 | } |
145 | if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { | 145 | if ((unlink(filename) < 0 || fsync(dfd) < 0) && seed_len) { |
146 | bb_perror_msg("unable to%s seed", " remove"); | 146 | bb_perror_msg("can't%s seed", " remove"); |
147 | return -1; | 147 | return -1; |
148 | } else if (!seed_len) | 148 | } else if (!seed_len) |
149 | return 0; | 149 | return 0; |
@@ -151,9 +151,9 @@ static int seed_from_file_if_exists(const char *filename, int dfd, bool credit, | |||
151 | sha256_hash(hash, &seed_len, sizeof(seed_len)); | 151 | sha256_hash(hash, &seed_len, sizeof(seed_len)); |
152 | sha256_hash(hash, seed, seed_len); | 152 | sha256_hash(hash, seed, seed_len); |
153 | 153 | ||
154 | printf("Seeding %zd bits %s crediting\n", seed_len * 8, credit ? "and" : "without"); | 154 | printf("Seeding %u bits %s crediting\n", (unsigned)seed_len * 8, credit ? "and" : "without"); |
155 | if (seed_rng(seed, seed_len, credit) < 0) { | 155 | if (seed_rng(seed, seed_len, credit) < 0) { |
156 | bb_perror_msg("unable to%s seed", ""); | 156 | bb_perror_msg("can't%s seed", ""); |
157 | return -1; | 157 | return -1; |
158 | } | 158 | } |
159 | return 0; | 159 | return 0; |
@@ -188,11 +188,11 @@ int seedrng_main(int argc UNUSED_PARAM, char *argv[]) | |||
188 | bb_simple_error_msg_and_die(bb_msg_you_must_be_root); | 188 | bb_simple_error_msg_and_die(bb_msg_you_must_be_root); |
189 | 189 | ||
190 | if (mkdir(seed_dir, 0700) < 0 && errno != EEXIST) | 190 | if (mkdir(seed_dir, 0700) < 0 && errno != EEXIST) |
191 | bb_perror_msg_and_die("unable to %s seed directory", "create"); | 191 | bb_perror_msg_and_die("can't %s seed directory", "create"); |
192 | 192 | ||
193 | dfd = open(seed_dir, O_DIRECTORY | O_RDONLY); | 193 | dfd = open(seed_dir, O_DIRECTORY | O_RDONLY); |
194 | if (dfd < 0 || flock(dfd, LOCK_EX) < 0) | 194 | if (dfd < 0 || flock(dfd, LOCK_EX) < 0) |
195 | bb_perror_msg_and_die("unable to %s seed directory", "lock"); | 195 | bb_perror_msg_and_die("can't %s seed directory", "lock"); |
196 | 196 | ||
197 | sha256_begin(&hash); | 197 | sha256_begin(&hash); |
198 | sha256_hash(&hash, "SeedRNG v1 Old+New Prefix", 25); | 198 | sha256_hash(&hash, "SeedRNG v1 Old+New Prefix", 25); |
@@ -211,7 +211,7 @@ int seedrng_main(int argc UNUSED_PARAM, char *argv[]) | |||
211 | 211 | ||
212 | new_seed_len = determine_optimal_seed_len(); | 212 | new_seed_len = determine_optimal_seed_len(); |
213 | if (read_new_seed(new_seed, new_seed_len, &new_seed_creditable) < 0) { | 213 | if (read_new_seed(new_seed, new_seed_len, &new_seed_creditable) < 0) { |
214 | bb_perror_msg("unable to%s seed", " read new"); | 214 | bb_perror_msg("can't%s seed", " read new"); |
215 | new_seed_len = SHA256_OUTSIZE; | 215 | new_seed_len = SHA256_OUTSIZE; |
216 | memset(new_seed, 0, SHA256_OUTSIZE); | 216 | memset(new_seed, 0, SHA256_OUTSIZE); |
217 | program_ret |= 1 << 3; | 217 | program_ret |= 1 << 3; |
@@ -220,14 +220,14 @@ int seedrng_main(int argc UNUSED_PARAM, char *argv[]) | |||
220 | sha256_hash(&hash, new_seed, new_seed_len); | 220 | sha256_hash(&hash, new_seed, new_seed_len); |
221 | sha256_end(&hash, new_seed + new_seed_len - SHA256_OUTSIZE); | 221 | sha256_end(&hash, new_seed + new_seed_len - SHA256_OUTSIZE); |
222 | 222 | ||
223 | printf("Saving %zu bits of %screditable seed for next boot\n", new_seed_len * 8, new_seed_creditable ? "" : "non-"); | 223 | printf("Saving %u bits of %screditable seed for next boot\n", (unsigned)new_seed_len * 8, new_seed_creditable ? "" : "non-"); |
224 | fd = open(non_creditable_seed, O_WRONLY | O_CREAT | O_TRUNC, 0400); | 224 | fd = open(non_creditable_seed, O_WRONLY | O_CREAT | O_TRUNC, 0400); |
225 | if (fd < 0 || full_write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { | 225 | if (fd < 0 || full_write(fd, new_seed, new_seed_len) != (ssize_t)new_seed_len || fsync(fd) < 0) { |
226 | bb_perror_msg("unable to%s seed", " write"); | 226 | bb_perror_msg("can't%s seed", " write"); |
227 | return program_ret | (1 << 4); | 227 | return program_ret | (1 << 4); |
228 | } | 228 | } |
229 | if (new_seed_creditable && rename(non_creditable_seed, creditable_seed) < 0) { | 229 | if (new_seed_creditable && rename(non_creditable_seed, creditable_seed) < 0) { |
230 | bb_simple_perror_msg("unable to make new seed creditable"); | 230 | bb_simple_perror_msg("can't make new seed creditable"); |
231 | return program_ret | (1 << 5); | 231 | return program_ret | (1 << 5); |
232 | } | 232 | } |
233 | return program_ret; | 233 | return program_ret; |