diff options
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-ca/Makefile | 2 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-rp/Makefile | 2 | ||||
| -rw-r--r-- | rcynic/rcynic.c | 2 | ||||
| -rw-r--r-- | utils/hashdir/hashdir.c | 1 | ||||
| -rw-r--r-- | utils/print_roa/print_roa.c | 4 | ||||
| -rw-r--r-- | utils/scan_roas/scan_roas.c | 5 |
6 files changed, 9 insertions, 7 deletions
diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile index 00bc344b..58797c7c 100644 --- a/buildtools/freebsd-skeleton/rpki-ca/Makefile +++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= rpki-ca # Disable a couple of recent whoopie cushions in the FreeBSD ports system MAKE_JOBS_UNSAFE= yes -NO_STAGE = yes +#NO_STAGE = yes # We depend on our own relying party code BUILD_DEPENDS+= rpki-rp>0:${PORTSDIR}/net/rpki-rp diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile index be88adc0..3218b8d9 100644 --- a/buildtools/freebsd-skeleton/rpki-rp/Makefile +++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" # Disable a couple of recent whoopie cushions in the FreeBSD ports system MAKE_JOBS_UNSAFE= yes -NO_STAGE = yes +#NO_STAGE = yes # rcynic's Makefile constructs an rcynic.conf for us if it doesn't # find one already installed. This turns out to be exactly what diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c index 5e90df89..dea9c48f 100644 --- a/rcynic/rcynic.c +++ b/rcynic/rcynic.c @@ -5686,7 +5686,7 @@ int main(int argc, char *argv[]) goto done; } - memset(&ta_dir, 0, sizeof(&ta_dir)); + memset(&ta_dir, 0, sizeof(ta_dir)); opterr = 0; diff --git a/utils/hashdir/hashdir.c b/utils/hashdir/hashdir.c index 6de778b5..1b5b0f46 100644 --- a/utils/hashdir/hashdir.c +++ b/utils/hashdir/hashdir.c @@ -36,6 +36,7 @@ #include <openssl/bio.h> #include <openssl/pem.h> #include <openssl/x509.h> +#include <openssl/err.h> #ifndef FILENAME_MAX #define FILENAME_MAX 1024 diff --git a/utils/print_roa/print_roa.c b/utils/print_roa/print_roa.c index cb186251..c88fc092 100644 --- a/utils/print_roa/print_roa.c +++ b/utils/print_roa/print_roa.c @@ -86,9 +86,9 @@ extract_signingTime(CMS_ContentInfo *cms, char *buffer, size_t buflen) switch (so->type) { case V_ASN1_UTCTIME: strcpy(buffer, (so->value.utctime->data[0] >= '5') ? "19" : "20"); - return strncpy(buffer + 2, so->value.utctime->data, buflen - 3); + return strncpy(buffer + 2, (const char *) so->value.utctime->data, buflen - 3); case V_ASN1_GENERALIZEDTIME: - return strncpy(buffer, so->value.generalizedtime->data, buflen - 1); + return strncpy(buffer, (const char *) so->value.generalizedtime->data, buflen - 1); default: return NULL; } diff --git a/utils/scan_roas/scan_roas.c b/utils/scan_roas/scan_roas.c index fc883bf6..f32e3827 100644 --- a/utils/scan_roas/scan_roas.c +++ b/utils/scan_roas/scan_roas.c @@ -90,9 +90,9 @@ extract_signingTime(CMS_ContentInfo *cms, char *buffer, size_t buflen) switch (so->type) { case V_ASN1_UTCTIME: strcpy(buffer, (so->value.utctime->data[0] >= '5') ? "19" : "20"); - return strncpy(buffer + 2, so->value.utctime->data, buflen - 3); + return strncpy(buffer + 2, (const char *) so->value.utctime->data, buflen - 3); case V_ASN1_GENERALIZEDTIME: - return strncpy(buffer, so->value.generalizedtime->data, buflen - 1); + return strncpy(buffer, (const char *) so->value.generalizedtime->data, buflen - 1); default: return NULL; } @@ -271,6 +271,7 @@ static int walk(const char *name) done: closedir(dir); + return ok; } |