diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-04-20 11:41:46 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-04-25 11:32:49 +0200 |
| commit | adc6b42612511bab57ed85f5fae4d1a4e026dd06 (patch) | |
| tree | 424fd9320187421c212a3186cdf84069e58ab540 | |
| parent | f7c5fdec7248ec0805429f115b2140fff54faad0 (diff) | |
| download | openssl-new-adc6b42612511bab57ed85f5fae4d1a4e026dd06.tar.gz | |
Fix regression of no-posix-io builds
Instead of using stat() to check if a file is a directory
we just skip . and .. as a workaround.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/20786)
(cherry picked from commit 3155b5a90e6ad9c7369d09e70e81686f4b321a73)
| -rw-r--r-- | ssl/ssl_cert.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 76b55779d5..54ae159c9d 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -29,11 +29,11 @@ # ifdef _WIN32 # define stat _stat # endif +# ifndef S_ISDIR +# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR) +# endif #endif -#ifndef S_ISDIR -# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR) -#endif static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid, void *other, @@ -761,8 +761,14 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, while ((filename = OPENSSL_DIR_read(&d, dir))) { char buf[1024]; int r; +#ifndef OPENSSL_NO_POSIX_IO struct stat st; +#else + /* Cannot use stat so just skip current and parent directories */ + if (strcmp(filename, ".") == 0 || strcmp(filename, "..") == 0) + continue; +#endif if (strlen(dir) + strlen(filename) + 2 > sizeof(buf)) { ERR_raise(ERR_LIB_SSL, SSL_R_PATH_TOO_LONG); goto err; @@ -772,9 +778,11 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, #else r = BIO_snprintf(buf, sizeof(buf), "%s/%s", dir, filename); #endif +#ifndef OPENSSL_NO_POSIX_IO /* Skip subdirectories */ if (!stat(buf, &st) && S_ISDIR(st.st_mode)) continue; +#endif if (r <= 0 || r >= (int)sizeof(buf)) goto err; if (!SSL_add_file_cert_subjects_to_stack(stack, buf)) |