Commit e7bc92bc authored by Richard Levitte's avatar Richard Levitte
Browse files

openssl rehash: use libcrypto variables for default dir 



X509_get_default_cert_dir_env() returns the default environment
variable to check for certificate directories.
X509_get_default_cert_dir() returns the default configured certificate
directory.

Use these instead of hard coding our own values, and thereby be more
integrated with the rest of OpenSSL.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5937)

(cherry picked from commit 362ff3c3)
parent f93f6a3b

apps/rehash.c

+4 −3
Original line number Diff line number Diff line
@@ -502,13 +502,14 @@ int rehash_main(int argc, char **argv) 
    if (*argv) {

        while (*argv)

            errs += do_dir(*argv++, h);

    } else if ((env = getenv("SSL_CERT_DIR")) != NULL) {

    } else if ((env = getenv(X509_get_default_cert_dir_env())) != NULL) {

        char lsc[2] = { LIST_SEPARATOR_CHAR, '\0' };

        m = OPENSSL_strdup(env);

        for (e = strtok(m, ":"); e != NULL; e = strtok(NULL, ":"))

        for (e = strtok(m, lsc); e != NULL; e = strtok(NULL, lsc))

            errs += do_dir(e, h);

        OPENSSL_free(m);

    } else {

        errs += do_dir("/etc/ssl/certs", h);

        errs += do_dir(X509_get_default_cert_dir(), h);

    }



 end: