diff options
| author | minyong.ha <minyong.ha@lge.com> | 2023-05-22 14:44:13 +0900 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-05-25 15:47:17 +0200 |
| commit | 1f32ec077c2544489cb8299c6953c3a9d2e9d1b9 (patch) | |
| tree | c4cdf9ae6116784a69cee02640109d83d14da17e | |
| parent | 321d6cd7f428d1c20b88dec8233eac8afe727577 (diff) | |
Fix a bug where the result of rehash is unstable
The root cause is that the file entries targeted for rehash are not actually sorted.
Sort was skipped because the compare function was null.
So a compare function has been implemented to allow file entries to be sorted.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21013)
(cherry picked from commit 31c94b5e1159b5435b2354e6525355ec33683ecc)
| -rw-r--r-- | apps/rehash.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/rehash.c b/apps/rehash.c index e4a4e14fd4..77e04f3a32 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -340,6 +340,11 @@ static int ends_with_dirsep(const char *path) return *path == '/'; } +static int sk_strcmp(const char * const *a, const char * const *b) +{ + return strcmp(*a, *b); +} + /* * Process a directory; return number of errors found. */ @@ -369,7 +374,7 @@ static int do_dir(const char *dirname, enum Hash h) if (verbose) BIO_printf(bio_out, "Doing %s\n", dirname); - if ((files = sk_OPENSSL_STRING_new_null()) == NULL) { + if ((files = sk_OPENSSL_STRING_new(sk_strcmp)) == NULL) { BIO_printf(bio_err, "Skipping %s, out of memory\n", dirname); errs = 1; goto err; |