diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-08-16 18:23:24 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-03 09:57:13 +0200 |
| commit | 219904d20f0f20d92fce76eee8f6797e73d0c459 (patch) | |
| tree | 8044a0e56174899c848394b7452c104ef4ca2886 | |
| parent | 055a5e33c7c1157b59396719693127d2a60120a9 (diff) | |
| download | gnutls-219904d20f0f20d92fce76eee8f6797e73d0c459.tar.gz | |
gnutls_x509_crt_export2: return 0 instead of the length
This aligns the behavior to the documentation.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
| -rw-r--r-- | lib/x509/x509.c | 13 | ||||
| -rw-r--r-- | tests/mini-x509-2.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/x509/x509.c b/lib/x509/x509.c index 2b68fe440e..c713f857a0 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -2997,10 +2997,15 @@ gnutls_x509_crt_export2(gnutls_x509_crt_t cert, if (!cert->modified && cert->der.size) { if (format == GNUTLS_X509_FMT_DER) return _gnutls_set_datum(out, cert->der.data, cert->der.size); - else - return _gnutls_fbase64_encode(PEM_X509_CERT2, cert->der.data, - cert->der.size, out); - + else { + int ret = _gnutls_fbase64_encode(PEM_X509_CERT2, + cert->der.data, + cert->der.size, + out); + if (ret < 0) + return ret; + return 0; + } } return _gnutls_x509_export_int2(cert->cert, format, PEM_X509_CERT2, diff --git a/tests/mini-x509-2.c b/tests/mini-x509-2.c index e336af8367..c1bc544e7d 100644 --- a/tests/mini-x509-2.c +++ b/tests/mini-x509-2.c @@ -296,6 +296,7 @@ void start(const char *prio) fail("gnutls_x509_crt_export2: %s\n", gnutls_strerror(ret)); exit(1); } + assert(ret == 0); gnutls_x509_crt_deinit(crt); if (scert.size != mcert->size || memcmp(scert.data, mcert->data, mcert->size) != 0) { @@ -331,6 +332,7 @@ void start(const char *prio) fail("gnutls_x509_crt_export2: %s\n", gnutls_strerror(ret)); exit(1); } + assert(ret == 0); gnutls_x509_crt_deinit(crt); if (ccert.size != mcert->size || memcmp(ccert.data, mcert->data, mcert->size) != 0) { |