Fix gnutls error code check; don't autoupdate for brew install (#772)

lsh123 · Mar 27, 2024 · 67778c3 · 67778c3
1 parent d706d58
commit 67778c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
@@ -99,10 +99,9 @@ jobs:
       uses: Homebrew/actions/setup-homebrew@master
     - name: install dependencies
       run: |
-          brew update
-          brew install automake autoconf pkg-config libtool
-          # brew install libxml2 libxslt
-          brew install openssl nspr nss libgcrypt gnutls
+          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install automake autoconf pkg-config libtool
+          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install libxml2 libxslt
+          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openssl nspr nss libgcrypt gnutls
     - uses: actions/checkout@v2
     - name: create-build-dirs
       run: |

diff --git a/src/gnutls/signatures.c b/src/gnutls/signatures.c
@@ -895,7 +895,9 @@ xmlSecGnuTLSSignatureVerify(xmlSecTransformPtr transform,
         err = gnutls_pubkey_verify_hash2(pubkey, ctx->signAlgo, ctx->verifyFlags, &hash, &signature);
     }
 
-    if(err == GNUTLS_E_SUCCESS) {
+    /* In case of a verification failure GNUTLS_E_PK_SIG_VERIFY_FAILED
+       is returned, and zero or positive code on success. */
+    if(err >= 0) {
         /* signature is good */
         transform->status = xmlSecTransformStatusOk;
     } else if(err == GNUTLS_E_PK_SIG_VERIFY_FAILED) {