#include "apps.h"
-#if defined(unix) || defined(__APPLE__)
+#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__)
# include <unistd.h>
# include <stdio.h>
# include <limits.h>
# include <openssl/x509.h>
+# ifndef NAME_MAX
+# define NAME_MAX 255
+# endif
# define MAX_COLLISIONS 256
typedef struct hentry_st {
unsigned int hash = 0;
int i, type, id;
unsigned char ch;
- char linktarget[NAME_MAX], *endptr;
+ char linktarget[PATH_MAX], *endptr;
ssize_t n;
for (i = 0; i < 8; i++) {
BIO *b;
const char *ext;
unsigned char digest[EVP_MAX_MD_SIZE];
- int i, type, errs = 0;
+ int type, errs = 0;
+ size_t i;
/* Does it end with a recognized extension? */
if ((ext = strrchr(filename, '.')) == NULL)
goto end;
- for (i = 0; i < (int)OSSL_NELEM(extensions); i++) {
+ for (i = 0; i < OSSL_NELEM(extensions); i++) {
if (strcasecmp(extensions[i], ext + 1) == 0)
break;
}
- if (i >= (int)OSSL_NELEM(extensions))
+ if (i >= OSSL_NELEM(extensions))
goto end;
/* Does it have X.509 data in it? */
type = TYPE_CRL;
name = X509_CRL_get_issuer(x->crl);
X509_CRL_digest(x->crl, evpmd, digest, NULL);
+ } else {
+ ++errs;
+ goto end;
}
if (name) {
if ((h == HASH_NEW) || (h == HASH_BOTH))
OPENSSL_DIR_CTX *d = NULL;
struct stat st;
unsigned char idmask[MAX_COLLISIONS / 8];
- int i, n, nextid, buflen, errs = 0;
+ int n, nextid, buflen, errs = 0;
+ size_t i;
const char *pathsep;
const char *filename;
char *buf;
+ 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] == '/') ? "" : "/";
- buflen += NAME_MAX + 2;
+ buflen += NAME_MAX + 1 + 1;
buf = app_malloc(buflen, "filename buffer");
if (verbose)
}
OPENSSL_DIR_end(&d);
- for (i = 0; i < (int)OSSL_NELEM(hash_table); i++) {
+ for (i = 0; i < OSSL_NELEM(hash_table); i++) {
for (bp = hash_table[i]; bp; bp = nextbp) {
nextbp = bp->next;
nextid = 0;
return (1);
}
-#endif /* defined(unix) || defined(__APPLE__) */
+#endif /* defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) */