]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
nettle: revert workaround for base64_decode_update return values
authorDaiki Ueno <ueno@gnu.org>
Tue, 3 Mar 2026 06:41:44 +0000 (15:41 +0900)
committerAlexander Sosedkin <asosedki@redhat.com>
Wed, 4 Mar 2026 10:36:17 +0000 (10:36 +0000)
This reverts commit d6014115969655005968491be1da8892ddedc134, as it
turned out that the change of error return value was only available in
an unreleased version of Nettle.

Signed-off-by: Daiki Ueno <ueno@gnu.org>
lib/x509_b64.c

index 3fb2c94dfb6d437fe800909d50776f997c7d6299..0ffbfa91bf7c0b1d36074d2ba480054a48cf4c9b 100644 (file)
@@ -285,10 +285,7 @@ int _gnutls_base64_decode(const uint8_t *data, size_t data_size,
 
        ret = base64_decode_update(&ctx, &size, result->data, pdata.size,
                                   (void *)pdata.data);
-       /* Nettle 4 returns -1 on error, while Nettle 3 returns 0;
-        * catch both
-        */
-       if (ret <= 0 || size == 0) {
+       if (ret == 0 || size == 0) {
                gnutls_assert();
                ret = GNUTLS_E_BASE64_DECODING_ERROR;
                goto fail;