X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2Frehash.c;h=273ad749692b71edfea8f4f33700ed4f8b3d4922;hb=a53d19cd0c4f28ed8c6ef708dcdd0599d1cbea27;hp=733794228dcb4f2db90360c464ccb31d3e3cbef6;hpb=846e33c729311169d9c988ceba29484b3783f244;p=openssl.git diff --git a/apps/rehash.c b/apps/rehash.c index 733794228d..273ad74969 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -15,7 +15,8 @@ #include "apps.h" -#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) +#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \ + (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000) # include # include # include @@ -24,12 +25,31 @@ # include # include +/* + * Make sure that the processing of symbol names is treated the same as when + * libcrypto is built. This is done automatically for public headers (see + * include/openssl/__DECC_INCLUDE_PROLOGUE.H and __DECC_INCLUDE_EPILOGUE.H), + * but not for internal headers. + */ +# ifdef __VMS +# pragma names save +# pragma names as_is,shortened +# endif + # include "internal/o_dir.h" + +# ifdef __VMS +# pragma names restore +# endif + # include # include # include +# ifndef PATH_MAX +# define PATH_MAX 4096 +# endif # ifndef NAME_MAX # define NAME_MAX 255 # endif @@ -110,8 +130,8 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename, for (ep = bp->first_entry; ep; ep = ep->next) { if (digest && memcmp(digest, ep->digest, evpmdsize) == 0) { BIO_printf(bio_err, - "%s: skipping duplicate certificate in %s\n", - opt_getprog(), filename); + "%s: skipping duplicate %s in %s\n", opt_getprog(), + type == TYPE_CERT ? "certificate" : "CRL", filename); return 1; } if (strcmp(filename, ep->filename) == 0) { @@ -159,7 +179,7 @@ static int handle_symlink(const char *filename, const char *fullpath) int i, type, id; unsigned char ch; char linktarget[PATH_MAX], *endptr; - ssize_t n; + ossl_ssize_t n; for (i = 0; i < 8; i++) { ch = filename[i]; @@ -170,9 +190,11 @@ static int handle_symlink(const char *filename, const char *fullpath) } if (filename[i++] != '.') return -1; - for (type = OSSL_NELEM(suffixes) - 1; type > 0; type--) - if (strcasecmp(suffixes[type], &filename[i]) == 0) + for (type = OSSL_NELEM(suffixes) - 1; type > 0; type--) { + const char *suffix = suffixes[type]; + if (strncasecmp(suffix, &filename[i], strlen(suffix)) == 0) break; + } i += strlen(suffixes[type]); id = strtoul(&filename[i], &endptr, 10); @@ -256,6 +278,43 @@ end: return errs; } +static void str_free(char *s) +{ + OPENSSL_free(s); +} + +static int ends_with_dirsep(const char *path) +{ + if (*path != '\0') + path += strlen(path) - 1; +# if defined __VMS + if (*path == ']' || *path == '>' || *path == ':') + return 1; +# elif defined _WIN32 + if (*path == '\\') + return 1; +# endif + return *path == '/'; +} + +static int massage_filename(char *name) +{ +# ifdef __VMS + char *p = strchr(name, ';'); + char *q = p; + + if (q != NULL) { + for (q++; *q != '\0'; q++) { + if (!isdigit((unsigned char)*q)) + return 1; + } + } + + *p = '\0'; +# endif + return 1; +} + /* * Process a directory; return number of errors found. */ @@ -266,27 +325,45 @@ static int do_dir(const char *dirname, enum Hash h) OPENSSL_DIR_CTX *d = NULL; struct stat st; unsigned char idmask[MAX_COLLISIONS / 8]; - int n, nextid, buflen, errs = 0; + int n, numfiles, nextid, buflen, errs = 0; size_t i; const char *pathsep; const char *filename; - char *buf; + char *buf, *copy; + STACK_OF(OPENSSL_STRING) *files = NULL; if (app_access(dirname, W_OK) < 0) { BIO_printf(bio_err, "Skipping %s, can't write\n", dirname); return 1; } buflen = strlen(dirname); - pathsep = (buflen && dirname[buflen - 1] == '/') ? "" : "/"; + pathsep = (buflen && !ends_with_dirsep(dirname)) ? "/": ""; buflen += NAME_MAX + 1 + 1; buf = app_malloc(buflen, "filename buffer"); if (verbose) BIO_printf(bio_out, "Doing %s\n", dirname); + if ((files = sk_OPENSSL_STRING_new_null()) == NULL) { + BIO_printf(bio_err, "Skipping %s, out of memory\n", dirname); + exit(1); + } while ((filename = OPENSSL_DIR_read(&d, dirname)) != NULL) { - if (snprintf(buf, buflen, "%s%s%s", - dirname, pathsep, filename) >= buflen) + if ((copy = strdup(filename)) == NULL + || !massage_filename(copy) + || sk_OPENSSL_STRING_push(files, copy) == 0) { + BIO_puts(bio_err, "out of memory\n"); + exit(1); + } + } + OPENSSL_DIR_end(&d); + sk_OPENSSL_STRING_sort(files); + + numfiles = sk_OPENSSL_STRING_num(files); + for (n = 0; n < numfiles; ++n) { + filename = sk_OPENSSL_STRING_value(files, n); + if (BIO_snprintf(buf, buflen, "%s%s%s", + dirname, pathsep, filename) >= buflen) continue; if (lstat(buf, &st) < 0) continue; @@ -294,7 +371,7 @@ static int do_dir(const char *dirname, enum Hash h) continue; errs += do_file(filename, buf, h); } - OPENSSL_DIR_end(&d); + sk_OPENSSL_STRING_pop_free(files, str_free); for (i = 0; i < OSSL_NELEM(hash_table); i++) { for (bp = hash_table[i]; bp; bp = nextbp) { @@ -309,8 +386,8 @@ static int do_dir(const char *dirname, enum Hash h) nextep = ep->next; if (ep->old_id < bp->num_needed) { /* Link exists, and is used as-is */ - snprintf(buf, buflen, "%08x.%s%d", bp->hash, - suffixes[bp->type], ep->old_id); + BIO_snprintf(buf, buflen, "%08x.%s%d", bp->hash, + suffixes[bp->type], ep->old_id); if (verbose) BIO_printf(bio_out, "link %s -> %s\n", ep->filename, buf); @@ -319,9 +396,9 @@ static int do_dir(const char *dirname, enum Hash h) while (bit_isset(idmask, nextid)) nextid++; - snprintf(buf, buflen, "%s%s%n%08x.%s%d", - dirname, pathsep, &n, bp->hash, - suffixes[bp->type], nextid); + BIO_snprintf(buf, buflen, "%s%s%n%08x.%s%d", + dirname, pathsep, &n, bp->hash, + suffixes[bp->type], nextid); if (verbose) BIO_printf(bio_out, "link %s -> %s\n", ep->filename, &buf[n]); @@ -338,11 +415,12 @@ static int do_dir(const char *dirname, enum Hash h) strerror(errno)); errs++; } + bit_set(idmask, nextid); } else if (remove_links) { /* Link to be deleted */ - snprintf(buf, buflen, "%s%s%n%08x.%s%d", - dirname, pathsep, &n, bp->hash, - suffixes[bp->type], ep->old_id); + BIO_snprintf(buf, buflen, "%s%s%n%08x.%s%d", + dirname, pathsep, &n, bp->hash, + suffixes[bp->type], ep->old_id); if (verbose) BIO_printf(bio_out, "unlink %s\n", &buf[n]); @@ -374,6 +452,7 @@ OPTIONS rehash_options[] = { {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"}, {OPT_HELP_STR, 1, '-', "Valid options are:\n"}, {"help", OPT_HELP, '-', "Display this summary"}, + {"h", OPT_HELP, '-', "Display this summary"}, {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"}, {"old", OPT_OLD, '-', "Use old-style hash to generate links"}, {"n", OPT_N, '-', "Do not remove existing links"},