]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix regression in no-deprecated build
authorTomas Mraz <tmraz@fedoraproject.org>
Tue, 19 Jan 2021 13:56:16 +0000 (14:56 +0100)
committerTomas Mraz <tmraz@fedoraproject.org>
Tue, 19 Jan 2021 14:45:34 +0000 (15:45 +0100)
Also add a new no-deprecated CI build to test it.

Fixes #13896

Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/13902)

.github/workflows/ci.yml
test/verify_extra_test.c

index a4565e5499a4ebd047f4f156415cfed050576084..ce40b5104ae874c5368800af835c3cf3cf2aad52 100644 (file)
@@ -70,6 +70,17 @@ jobs:
       - name: make test
         run: make test
 
+  no-deprecated:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: config
+        run: ./config --strict-warnings no-deprecated && perl configdata.pm --dump
+      - name: make
+        run: make -s -j4
+      - name: make test
+        run: make test
+
   sanitizers:
     runs-on: ubuntu-latest
     steps:
index 94faa4c78b31623b10cbee1d025da6848cdb1781..18f785ab8b891e1e8c01422286495d539343d931 100644 (file)
@@ -200,7 +200,7 @@ static int test_self_signed(const char *filename, int expected)
     ret = TEST_ptr(cert)
         && TEST_true(sk_X509_push(trusted, cert))
         && TEST_true(X509_STORE_CTX_init(ctx, NULL, cert, NULL));
-    X509_STORE_CTX_trusted_stack(ctx, trusted);
+    X509_STORE_CTX_set0_trusted_stack(ctx, trusted);
     ret = ret && TEST_int_eq(X509_verify_cert(ctx), expected);
 
     X509_STORE_CTX_free(ctx);