try work around ech_helpers linking

sftcd · Dec 14, 2023 · 6c07954 · 6c07954
1 parent f8226d4
commit 6c07954
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/fuzz/build.info b/fuzz/build.info
@@ -61,7 +61,7 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
   INCLUDE[echclient]=../include {- $ex_inc -}
   DEPEND[echclient]=../libcrypto ../libssl {- $ex_lib -}
 
-  SOURCE[echserver]=echserver.c driver.c fuzz_rand.c
+  SOURCE[echserver]=echserver.c ../ssl/ech_helpers.c driver.c fuzz_rand.c
   INCLUDE[echserver]=../include {- $ex_inc -}
   DEPEND[echserver]=../libcrypto ../libssl {- $ex_lib -}
 
@@ -179,7 +179,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[echclient-test]=../include
   DEPEND[echclient-test]=../libcrypto ../libssl
 
-  SOURCE[echserver-test]=echserver.c test-corpus.c fuzz_rand.c
+  SOURCE[echserver-test]=echserver.c ../ssl/ech_helpers.c test-corpus.c fuzz_rand.c
   INCLUDE[echserver-test]=../include
   DEPEND[echserver-test]=../libcrypto ../libssl
 

diff --git a/fuzz/echserver.c b/fuzz/echserver.c
@@ -575,7 +575,6 @@ static int make_ch_with_ech(unsigned char **out, size_t *outlen,
                             const unsigned char *in, size_t inlen)
 {
     int res = 0;
-    OSSL_HPKE_SUITE hpke_suite = OSSL_HPKE_SUITE_DEFAULT;
     OSSL_HPKE_CTX *hctx = NULL;
     unsigned char *mypub = NULL;
     static size_t mypublen = 0;