diff options
| author | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
| commit | c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd (patch) | |
| tree | 3b45c8e63a37b132f0fe10c570b8302052c547de /contrib/ntp/util/ntp-keygen.c | |
| parent | 3066f138bc3bf99f5cf6ec9412903d206c329cc7 (diff) | |
| download | FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.zip FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.tar.gz | |
Merge r293423, r293469:
ntp 4.2.8p5
Relnotes: yes
Diffstat (limited to 'contrib/ntp/util/ntp-keygen.c')
| -rw-r--r-- | contrib/ntp/util/ntp-keygen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ntp/util/ntp-keygen.c b/contrib/ntp/util/ntp-keygen.c index 9568adc..ab34927 100644 --- a/contrib/ntp/util/ntp-keygen.c +++ b/contrib/ntp/util/ntp-keygen.c @@ -187,7 +187,7 @@ readlink( int len ) { - return strlen(file); + return (int)strlen(file); /* assume no overflow possible */ } /* @@ -1957,10 +1957,10 @@ x509 ( X509_time_adj(X509_get_notAfter(cert), lifetime * SECSPERDAY, &epoch); subj = X509_get_subject_name(cert); X509_NAME_add_entry_by_txt(subj, "commonName", MBSTRING_ASC, - (u_char *)name, strlen(name), -1, 0); + (u_char *)name, -1, -1, 0); subj = X509_get_issuer_name(cert); X509_NAME_add_entry_by_txt(subj, "commonName", MBSTRING_ASC, - (u_char *)name, strlen(name), -1, 0); + (u_char *)name, -1, -1, 0); if (!X509_set_pubkey(cert, pkey)) { fprintf(stderr, "Assign certificate signing key fails\n%s\n", ERR_error_string(ERR_get_error(), NULL)); |
