diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2992e8b..e8b470d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: curl -Lo libusb.patch https://github.com/ProcursusTeam/Procursus/raw/5f4f302f6cb81ce10c7d92ffefd75c004b5da18f/build_patch/libusb/0001-Get-rid-of-some-macro-checks.patch git apply -v libusb.patch fi - ./configure ${{ env.CONFIGURE_ARGS }} --disable-udev --enable-log --enable-debug-log + ./configure ${{ env.CONFIGURE_ARGS }} --disable-udev --enable-log gmake -j$(sysctl -n hw.ncpu) gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} cd .. diff --git a/patches/0001-Allow-empty-x509-cert-issuer.patch b/patches/0001-Allow-empty-x509-cert-issuer.patch index 46c20a3..6696609 100644 --- a/patches/0001-Allow-empty-x509-cert-issuer.patch +++ b/patches/0001-Allow-empty-x509-cert-issuer.patch @@ -1,6 +1,6 @@ -0001-Allow-empty-x509-cert-issuer.patchFrom a1c60b613c262e297eac27c449848ba01e446bae Mon Sep 17 00:00:00 2001 +From 632cdb6de3f1693fb90d60d81552b723e8dd5e84 Mon Sep 17 00:00:00 2001 From: Nick Chan -Date: Wed, 25 Jan 2023 01:11:02 +0800 +Date: Wed, 25 Jan 2023 01:53:00 +0800 Subject: [PATCH] Allow empty x509 cert issuer --- @@ -8,24 +8,25 @@ Subject: [PATCH] Allow empty x509 cert issuer 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/x509_crt.c b/library/x509_crt.c -index 033009797..a06a9fb82 100644 +index 0eee97cb6..46702f683 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c -@@ -1220,13 +1220,13 @@ static int x509_crt_parse_der_core(mbedtls_x509_crt *crt, - - if ((ret = mbedtls_asn1_get_tag(&p, end, &len, - MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) { -- mbedtls_x509_crt_free(crt); -- return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_FORMAT, ret); -+ // mbedtls_x509_crt_free(crt); -+ // return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_FORMAT, ret); +@@ -1185,14 +1185,14 @@ static int x509_crt_parse_der_core( mbedtls_x509_crt *crt, + if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, + MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 ) + { +- mbedtls_x509_crt_free( crt ); +- return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_X509_INVALID_FORMAT, ret ) ); ++ // mbedtls_x509_crt_free( crt ); ++ // return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_X509_INVALID_FORMAT, ret ) ); } - if ((ret = mbedtls_x509_get_name(&p, p + len, &crt->issuer)) != 0) { -- mbedtls_x509_crt_free(crt); -- return ret; -+ // mbedtls_x509_crt_free(crt); -+ // return ret; + if( ( ret = mbedtls_x509_get_name( &p, p + len, &crt->issuer ) ) != 0 ) + { +- mbedtls_x509_crt_free( crt ); +- return( ret ); ++ // mbedtls_x509_crt_free( crt ); ++ // return( ret ); } crt->issuer_raw.len = p - crt->issuer_raw.p;