diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-04-25 17:31:59 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-04-25 17:31:59 +0000 |
| commit | a111a76d190af22bc54c3a5242d9ee65f1357d4a (patch) | |
| tree | a681819b97f46474f3d95b5a6fecb3f200ca2506 | |
| parent | eaa5ef3addfcfb22ffa7c0e0fcb52960c2abbe64 (diff) | |
| parent | 1934a16150043ffbc96a6b57722a95ab0d45631b (diff) | |
| download | gnutls-1214-implement-channel-bindings-for-tls-1-3.tar.gz | |
Merge branch 'wip/dueno/gitignore' into 'master'1214-implement-channel-bindings-for-tls-1-3
gnutls_x509_crt_get_dn: clarify null-termination of the output
Closes #1191 and #1187
See merge request gnutls/gnutls!1418
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 11 | ||||
| -rw-r--r-- | lib/x509/x509.c | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 4bf0da343c..91be9f9a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,13 @@ /ABOUT-NLS AUTHORS ABOUT-NLS +# GNU global +GPATH +GSYMS +GRTAGS +GTAGS +# ctags, etags +TAGS aclocal.m4 aminclude_static.am autom4te.cache/ diff --git a/lib/Makefile.am b/lib/Makefile.am index 6eb175bf6f..f213be19a9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -196,17 +196,6 @@ all-local: $(hmac_files) $(AM_V_GEN) $(builddir)/fipshmac .libs/$(gnutls_so) > $@-t && mv $@-t $@ CLEANFILES = $(hmac_files) - -install-exec-hook: $(hmac_files) - for file in $(hmac_files); do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(libdir); \ - done - -uninstall-hook: - for file in $(hmac_files); do \ - basename=$$(expr $$file : '.*/\(.*\)'); \ - $(DESTDIR)$(libdir)/$$basename; \ - done endif if ENABLE_TROUSERS diff --git a/lib/x509/x509.c b/lib/x509/x509.c index 4e494d10e0..b56f6195b2 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -861,7 +861,8 @@ gnutls_x509_crt_get_issuer_dn_oid(gnutls_x509_crt_t cert, * described in RFC4514. The output string will be ASCII or UTF-8 * encoded, depending on the certificate data. * - * If @buf is null then only the size will be filled. + * The @buf returned will be null terminated and the @buf_size will account + * for the trailing null. If @buf is null then only the size will be filled. * * This function does not output a fully RFC4514 compliant string, if * that is required see gnutls_x509_crt_get_dn3(). diff --git a/tests/Makefile.am b/tests/Makefile.am index ed32dadcc5..3ae5459745 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -475,7 +475,7 @@ pkcs11_tls_neg_pkcs11_no_key_LDADD = $(LDADD) $(LIBDL) endif endif -dist_check_SCRIPTS = rfc2253-escape-test rsa-md5-collision/rsa-md5-collision.sh systemkey.sh tls13/prf-early.sh +dist_check_SCRIPTS = rfc2253-escape-test.sh rsa-md5-collision/rsa-md5-collision.sh systemkey.sh tls13/prf-early.sh if !WINDOWS |