projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configure: catch the build tree configdata.pm
[openssl.git]
/
apps
/
rehash.c
diff --git
a/apps/rehash.c
b/apps/rehash.c
index 2ffe5c5683c6bbd1106520816f51518b5e7def86..d918ac89e92e452ef073ebcbf25ebc9ce0393468 100644
(file)
--- a/
apps/rehash.c
+++ b/
apps/rehash.c
@@
-1,5
+1,6
@@
/*
/*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com>
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-7,13
+8,8
@@
* https://www.openssl.org/source/license.html
*/
* https://www.openssl.org/source/license.html
*/
-/*
- * C implementation based on the original Perl and shell versions
- *
- * Copyright (c) 2013-2014 Timo Teräs <timo.teras@iki.fi>
- */
-
#include "apps.h"
#include "apps.h"
+#include "progs.h"
#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \
(defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \
(defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
@@
-254,11
+250,11
@@
static int do_file(const char *filename, const char *fullpath, enum Hash h)
goto end;
}
x = sk_X509_INFO_value(inf, 0);
goto end;
}
x = sk_X509_INFO_value(inf, 0);
- if (x->x509) {
+ if (x->x509
!= NULL
) {
type = TYPE_CERT;
name = X509_get_subject_name(x->x509);
X509_digest(x->x509, evpmd, digest, NULL);
type = TYPE_CERT;
name = X509_get_subject_name(x->x509);
X509_digest(x->x509, evpmd, digest, NULL);
- } else if (x->crl) {
+ } else if (x->crl
!= NULL
) {
type = TYPE_CRL;
name = X509_CRL_get_issuer(x->crl);
X509_CRL_digest(x->crl, evpmd, digest, NULL);
type = TYPE_CRL;
name = X509_CRL_get_issuer(x->crl);
X509_CRL_digest(x->crl, evpmd, digest, NULL);
@@
-266,7
+262,7
@@
static int do_file(const char *filename, const char *fullpath, enum Hash h)
++errs;
goto end;
}
++errs;
goto end;
}
- if (name) {
+ if (name
!= NULL
) {
if ((h == HASH_NEW) || (h == HASH_BOTH))
errs += add_entry(type, X509_NAME_hash(name), filename, digest, 1, ~0);
if ((h == HASH_OLD) || (h == HASH_BOTH))
if ((h == HASH_NEW) || (h == HASH_BOTH))
errs += add_entry(type, X509_NAME_hash(name), filename, digest, 1, ~0);
if ((h == HASH_OLD) || (h == HASH_BOTH))
@@
-305,7
+301,7
@@
static int massage_filename(char *name)
if (q != NULL) {
for (q++; *q != '\0'; q++) {
if (q != NULL) {
for (q++; *q != '\0'; q++) {
- if (!isdigit(*q))
+ if (!isdigit(
(unsigned char)
*q))
return 1;
}
}
return 1;
}
}
@@
-362,8
+358,8
@@
static int do_dir(const char *dirname, enum Hash h)
numfiles = sk_OPENSSL_STRING_num(files);
for (n = 0; n < numfiles; ++n) {
filename = sk_OPENSSL_STRING_value(files, n);
numfiles = sk_OPENSSL_STRING_num(files);
for (n = 0; n < numfiles; ++n) {
filename = sk_OPENSSL_STRING_value(files, n);
- if (snprintf(buf, buflen, "%s%s%s",
- dirname, pathsep, filename) >= buflen)
+ if (
BIO_
snprintf(buf, buflen, "%s%s%s",
+
dirname, pathsep, filename) >= buflen)
continue;
if (lstat(buf, &st) < 0)
continue;
continue;
if (lstat(buf, &st) < 0)
continue;
@@
-386,8
+382,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 */
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);
if (verbose)
BIO_printf(bio_out, "link %s -> %s\n",
ep->filename, buf);
@@
-396,9
+392,9
@@
static int do_dir(const char *dirname, enum Hash h)
while (bit_isset(idmask, nextid))
nextid++;
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]);
if (verbose)
BIO_printf(bio_out, "link %s -> %s\n",
ep->filename, &buf[n]);
@@
-418,9
+414,9
@@
static int do_dir(const char *dirname, enum Hash h)
bit_set(idmask, nextid);
} else if (remove_links) {
/* Link to be deleted */
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]);
if (verbose)
BIO_printf(bio_out, "unlink %s\n",
&buf[n]);
@@
-499,8
+495,8
@@
int rehash_main(int argc, char **argv)
evpmd = EVP_sha1();
evpmdsize = EVP_MD_size(evpmd);
evpmd = EVP_sha1();
evpmdsize = EVP_MD_size(evpmd);
- if (*argv) {
- while (*argv)
+ if (*argv
!= NULL
) {
+ while (*argv
!= NULL
)
errs += do_dir(*argv++, h);
} else if ((env = getenv("SSL_CERT_DIR")) != NULL) {
m = OPENSSL_strdup(env);
errs += do_dir(*argv++, h);
} else if ((env = getenv("SSL_CERT_DIR")) != NULL) {
m = OPENSSL_strdup(env);
@@
-523,7
+519,7
@@
const OPTIONS rehash_options[] = {
int rehash_main(int argc, char **argv)
{
BIO_printf(bio_err, "Not available; use c_rehash script\n");
int rehash_main(int argc, char **argv)
{
BIO_printf(bio_err, "Not available; use c_rehash script\n");
- return
(1)
;
+ return
1
;
}
#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */
}
#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */