diff --git a/src/libsodium/Makefile.in b/src/libsodium/Makefile.in index cc75e619..a4678afb 100644 --- a/src/libsodium/Makefile.in +++ b/src/libsodium/Makefile.in @@ -320,7 +320,7 @@ am__libsodium_la_SOURCES_DIST = \ crypto_ipcrypt/implementations.h \ crypto_kdf/blake2b/kdf_blake2b.c crypto_kdf/crypto_kdf.c \ crypto_kdf/hkdf/kdf_hkdf_sha256.c \ - crypto_kdf/hkdf/kdf_hkdf_sha512.c \ + crypto_kdf/hkdf/kdf_hkdf_sha512.c crypto_kem/crypto_kem.c \ crypto_kem/mlkem768/kem_mlkem768.c \ crypto_kem/mlkem768/ref/kem_mlkem768_ref.c \ crypto_kem/mlkem768/ref/kem_mlkem768_ref.h \ @@ -513,6 +513,7 @@ am_libsodium_la_OBJECTS = \ crypto_kdf/libsodium_la-crypto_kdf.lo \ crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha256.lo \ crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha512.lo \ + crypto_kem/libsodium_la-crypto_kem.lo \ crypto_kem/mlkem768/libsodium_la-kem_mlkem768.lo \ crypto_kem/mlkem768/ref/libsodium_la-kem_mlkem768_ref.lo \ crypto_kem/xwing/libsodium_la-kem_xwing.lo \ @@ -672,6 +673,7 @@ am__depfiles_remade = crypto_aead/aegis128l/$(DEPDIR)/libaesni_la-aegis128l_aesn crypto_kdf/blake2b/$(DEPDIR)/libsodium_la-kdf_blake2b.Plo \ crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha256.Plo \ crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha512.Plo \ + crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Plo \ crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Plo \ crypto_kem/mlkem768/ref/$(DEPDIR)/libsodium_la-kem_mlkem768_ref.Plo \ crypto_kem/xwing/$(DEPDIR)/libsodium_la-kem_xwing.Plo \ @@ -1089,7 +1091,7 @@ libsodium_la_SOURCES = crypto_aead/aegis128l/aead_aegis128l.c \ crypto_ipcrypt/implementations.h \ crypto_kdf/blake2b/kdf_blake2b.c crypto_kdf/crypto_kdf.c \ crypto_kdf/hkdf/kdf_hkdf_sha256.c \ - crypto_kdf/hkdf/kdf_hkdf_sha512.c \ + crypto_kdf/hkdf/kdf_hkdf_sha512.c crypto_kem/crypto_kem.c \ crypto_kem/mlkem768/kem_mlkem768.c \ crypto_kem/mlkem768/ref/kem_mlkem768_ref.c \ crypto_kem/mlkem768/ref/kem_mlkem768_ref.h \ @@ -1772,6 +1774,14 @@ crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha256.lo: \ crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha512.lo: \ crypto_kdf/hkdf/$(am__dirstamp) \ crypto_kdf/hkdf/$(DEPDIR)/$(am__dirstamp) +crypto_kem/$(am__dirstamp): + @$(MKDIR_P) crypto_kem + @: >>crypto_kem/$(am__dirstamp) +crypto_kem/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) crypto_kem/$(DEPDIR) + @: >>crypto_kem/$(DEPDIR)/$(am__dirstamp) +crypto_kem/libsodium_la-crypto_kem.lo: crypto_kem/$(am__dirstamp) \ + crypto_kem/$(DEPDIR)/$(am__dirstamp) crypto_kem/mlkem768/$(am__dirstamp): @$(MKDIR_P) crypto_kem/mlkem768 @: >>crypto_kem/mlkem768/$(am__dirstamp) @@ -2434,6 +2444,8 @@ mostlyclean-compile: -rm -f crypto_kdf/blake2b/*.lo -rm -f crypto_kdf/hkdf/*.$(OBJEXT) -rm -f crypto_kdf/hkdf/*.lo + -rm -f crypto_kem/*.$(OBJEXT) + -rm -f crypto_kem/*.lo -rm -f crypto_kem/mlkem768/*.$(OBJEXT) -rm -f crypto_kem/mlkem768/*.lo -rm -f crypto_kem/mlkem768/ref/*.$(OBJEXT) @@ -2606,6 +2618,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@crypto_kdf/blake2b/$(DEPDIR)/libsodium_la-kdf_blake2b.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha256.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha512.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_kem/mlkem768/ref/$(DEPDIR)/libsodium_la-kem_mlkem768_ref.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_kem/xwing/$(DEPDIR)/libsodium_la-kem_xwing.Plo@am__quote@ # am--include-marker @@ -3153,6 +3166,13 @@ crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha512.lo: crypto_kdf/hkdf/kdf_hkdf_sha512 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_kdf/hkdf/libsodium_la-kdf_hkdf_sha512.lo `test -f 'crypto_kdf/hkdf/kdf_hkdf_sha512.c' || echo '$(srcdir)/'`crypto_kdf/hkdf/kdf_hkdf_sha512.c +crypto_kem/libsodium_la-crypto_kem.lo: crypto_kem/crypto_kem.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_kem/libsodium_la-crypto_kem.lo -MD -MP -MF crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Tpo -c -o crypto_kem/libsodium_la-crypto_kem.lo `test -f 'crypto_kem/crypto_kem.c' || echo '$(srcdir)/'`crypto_kem/crypto_kem.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Tpo crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_kem/crypto_kem.c' object='crypto_kem/libsodium_la-crypto_kem.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_kem/libsodium_la-crypto_kem.lo `test -f 'crypto_kem/crypto_kem.c' || echo '$(srcdir)/'`crypto_kem/crypto_kem.c + crypto_kem/mlkem768/libsodium_la-kem_mlkem768.lo: crypto_kem/mlkem768/kem_mlkem768.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_kem/mlkem768/libsodium_la-kem_mlkem768.lo -MD -MP -MF crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Tpo -c -o crypto_kem/mlkem768/libsodium_la-kem_mlkem768.lo `test -f 'crypto_kem/mlkem768/kem_mlkem768.c' || echo '$(srcdir)/'`crypto_kem/mlkem768/kem_mlkem768.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Tpo crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Plo @@ -3783,6 +3803,7 @@ clean-libtool: -rm -rf crypto_kdf/.libs crypto_kdf/_libs -rm -rf crypto_kdf/blake2b/.libs crypto_kdf/blake2b/_libs -rm -rf crypto_kdf/hkdf/.libs crypto_kdf/hkdf/_libs + -rm -rf crypto_kem/.libs crypto_kem/_libs -rm -rf crypto_kem/mlkem768/.libs crypto_kem/mlkem768/_libs -rm -rf crypto_kem/mlkem768/ref/.libs crypto_kem/mlkem768/ref/_libs -rm -rf crypto_kem/xwing/.libs crypto_kem/xwing/_libs @@ -4127,6 +4148,8 @@ distclean-generic: -$(am__rm_f) crypto_kdf/blake2b/$(am__dirstamp) -$(am__rm_f) crypto_kdf/hkdf/$(DEPDIR)/$(am__dirstamp) -$(am__rm_f) crypto_kdf/hkdf/$(am__dirstamp) + -$(am__rm_f) crypto_kem/$(DEPDIR)/$(am__dirstamp) + -$(am__rm_f) crypto_kem/$(am__dirstamp) -$(am__rm_f) crypto_kem/mlkem768/$(DEPDIR)/$(am__dirstamp) -$(am__rm_f) crypto_kem/mlkem768/$(am__dirstamp) -$(am__rm_f) crypto_kem/mlkem768/ref/$(DEPDIR)/$(am__dirstamp) @@ -4305,6 +4328,7 @@ distclean: distclean-recursive -rm -f crypto_kdf/blake2b/$(DEPDIR)/libsodium_la-kdf_blake2b.Plo -rm -f crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha256.Plo -rm -f crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha512.Plo + -rm -f crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Plo -rm -f crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Plo -rm -f crypto_kem/mlkem768/ref/$(DEPDIR)/libsodium_la-kem_mlkem768_ref.Plo -rm -f crypto_kem/xwing/$(DEPDIR)/libsodium_la-kem_xwing.Plo @@ -4492,6 +4516,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f crypto_kdf/blake2b/$(DEPDIR)/libsodium_la-kdf_blake2b.Plo -rm -f crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha256.Plo -rm -f crypto_kdf/hkdf/$(DEPDIR)/libsodium_la-kdf_hkdf_sha512.Plo + -rm -f crypto_kem/$(DEPDIR)/libsodium_la-crypto_kem.Plo -rm -f crypto_kem/mlkem768/$(DEPDIR)/libsodium_la-kem_mlkem768.Plo -rm -f crypto_kem/mlkem768/ref/$(DEPDIR)/libsodium_la-kem_mlkem768_ref.Plo -rm -f crypto_kem/xwing/$(DEPDIR)/libsodium_la-kem_xwing.Plo diff --git a/src/libsodium/include/Makefile.in b/src/libsodium/include/Makefile.in index c23afd2e..c5651e83 100644 --- a/src/libsodium/include/Makefile.in +++ b/src/libsodium/include/Makefile.in @@ -383,6 +383,7 @@ SODIUM_EXPORT = \ sodium/crypto_kdf_hkdf_sha256.h \ sodium/crypto_kdf_hkdf_sha512.h \ sodium/crypto_kdf_blake2b.h \ + sodium/crypto_kem.h \ sodium/crypto_kem_mlkem768.h \ sodium/crypto_kem_xwing.h \ sodium/crypto_kx.h \ diff --git a/test/default/Makefile.in b/test/default/Makefile.in index 563b1c98..b4ee2b42 100644 --- a/test/default/Makefile.in +++ b/test/default/Makefile.in @@ -159,16 +159,17 @@ am__EXEEXT_3 = aead_aegis128l$(EXEEXT) aead_aegis256$(EXEEXT) \ generichash$(EXEEXT) generichash2$(EXEEXT) \ generichash3$(EXEEXT) hash$(EXEEXT) hash3$(EXEEXT) \ hash_sha3256$(EXEEXT) hash_sha3512$(EXEEXT) ipcrypt$(EXEEXT) \ - kdf$(EXEEXT) kem_mlkem768$(EXEEXT) kem_xwing$(EXEEXT) \ - keygen$(EXEEXT) kx$(EXEEXT) metamorphic$(EXEEXT) \ - misuse$(EXEEXT) onetimeauth$(EXEEXT) onetimeauth2$(EXEEXT) \ - onetimeauth7$(EXEEXT) pwhash_argon2i$(EXEEXT) \ - pwhash_argon2id$(EXEEXT) pwhash_argon2id2$(EXEEXT) \ - randombytes$(EXEEXT) scalarmult$(EXEEXT) scalarmult2$(EXEEXT) \ - scalarmult5$(EXEEXT) scalarmult6$(EXEEXT) scalarmult7$(EXEEXT) \ - scalarmult8$(EXEEXT) secretbox$(EXEEXT) secretbox2$(EXEEXT) \ - secretbox7$(EXEEXT) secretbox8$(EXEEXT) \ - secretbox_easy$(EXEEXT) secretbox_easy2$(EXEEXT) \ + kdf$(EXEEXT) kem$(EXEEXT) kem_mlkem768$(EXEEXT) \ + kem_xwing$(EXEEXT) keygen$(EXEEXT) kx$(EXEEXT) \ + metamorphic$(EXEEXT) misuse$(EXEEXT) onetimeauth$(EXEEXT) \ + onetimeauth2$(EXEEXT) onetimeauth7$(EXEEXT) \ + pwhash_argon2i$(EXEEXT) pwhash_argon2id$(EXEEXT) \ + pwhash_argon2id2$(EXEEXT) randombytes$(EXEEXT) \ + scalarmult$(EXEEXT) scalarmult2$(EXEEXT) scalarmult5$(EXEEXT) \ + scalarmult6$(EXEEXT) scalarmult7$(EXEEXT) scalarmult8$(EXEEXT) \ + secretbox$(EXEEXT) secretbox2$(EXEEXT) secretbox7$(EXEEXT) \ + secretbox8$(EXEEXT) secretbox_easy$(EXEEXT) \ + secretbox_easy2$(EXEEXT) \ secretstream_xchacha20poly1305$(EXEEXT) shorthash$(EXEEXT) \ sign$(EXEEXT) sodium_core$(EXEEXT) sodium_utils$(EXEEXT) \ sodium_version$(EXEEXT) stream$(EXEEXT) stream2$(EXEEXT) \ @@ -324,6 +325,9 @@ kdf_hkdf3_DEPENDENCIES = $(TESTS_LDADD) kdf_hkdf4_SOURCES = kdf_hkdf4.c kdf_hkdf4_OBJECTS = kdf_hkdf4.$(OBJEXT) kdf_hkdf4_DEPENDENCIES = $(TESTS_LDADD) +kem_SOURCES = kem.c +kem_OBJECTS = kem.$(OBJEXT) +kem_DEPENDENCIES = $(TESTS_LDADD) kem_mlkem768_SOURCES = kem_mlkem768.c kem_mlkem768_OBJECTS = kem_mlkem768.$(OBJEXT) kem_mlkem768_DEPENDENCIES = $(TESTS_LDADD) @@ -521,17 +525,18 @@ am__depfiles_remade = ./$(DEPDIR)/aead_aegis128l.Po \ ./$(DEPDIR)/ipcrypt.Po ./$(DEPDIR)/kdf.Po \ ./$(DEPDIR)/kdf_hkdf.Po ./$(DEPDIR)/kdf_hkdf2.Po \ ./$(DEPDIR)/kdf_hkdf3.Po ./$(DEPDIR)/kdf_hkdf4.Po \ - ./$(DEPDIR)/kem_mlkem768.Po ./$(DEPDIR)/kem_xwing.Po \ - ./$(DEPDIR)/keygen.Po ./$(DEPDIR)/kx.Po \ - ./$(DEPDIR)/metamorphic.Po ./$(DEPDIR)/misuse.Po \ - ./$(DEPDIR)/onetimeauth.Po ./$(DEPDIR)/onetimeauth2.Po \ - ./$(DEPDIR)/onetimeauth7.Po ./$(DEPDIR)/pwhash_argon2i.Po \ - ./$(DEPDIR)/pwhash_argon2id.Po ./$(DEPDIR)/pwhash_argon2id2.Po \ - ./$(DEPDIR)/pwhash_scrypt.Po ./$(DEPDIR)/pwhash_scrypt_ll.Po \ - ./$(DEPDIR)/randombytes.Po ./$(DEPDIR)/scalarmult.Po \ - ./$(DEPDIR)/scalarmult2.Po ./$(DEPDIR)/scalarmult5.Po \ - ./$(DEPDIR)/scalarmult6.Po ./$(DEPDIR)/scalarmult7.Po \ - ./$(DEPDIR)/scalarmult8.Po ./$(DEPDIR)/scalarmult_ed25519.Po \ + ./$(DEPDIR)/kem.Po ./$(DEPDIR)/kem_mlkem768.Po \ + ./$(DEPDIR)/kem_xwing.Po ./$(DEPDIR)/keygen.Po \ + ./$(DEPDIR)/kx.Po ./$(DEPDIR)/metamorphic.Po \ + ./$(DEPDIR)/misuse.Po ./$(DEPDIR)/onetimeauth.Po \ + ./$(DEPDIR)/onetimeauth2.Po ./$(DEPDIR)/onetimeauth7.Po \ + ./$(DEPDIR)/pwhash_argon2i.Po ./$(DEPDIR)/pwhash_argon2id.Po \ + ./$(DEPDIR)/pwhash_argon2id2.Po ./$(DEPDIR)/pwhash_scrypt.Po \ + ./$(DEPDIR)/pwhash_scrypt_ll.Po ./$(DEPDIR)/randombytes.Po \ + ./$(DEPDIR)/scalarmult.Po ./$(DEPDIR)/scalarmult2.Po \ + ./$(DEPDIR)/scalarmult5.Po ./$(DEPDIR)/scalarmult6.Po \ + ./$(DEPDIR)/scalarmult7.Po ./$(DEPDIR)/scalarmult8.Po \ + ./$(DEPDIR)/scalarmult_ed25519.Po \ ./$(DEPDIR)/scalarmult_ristretto255.Po \ ./$(DEPDIR)/secretbox.Po ./$(DEPDIR)/secretbox2.Po \ ./$(DEPDIR)/secretbox7.Po ./$(DEPDIR)/secretbox8.Po \ @@ -578,20 +583,21 @@ SOURCES = aead_aegis128l.c aead_aegis256.c aead_aes256gcm.c \ core_ristretto255.c ed25519_convert.c generichash.c \ generichash2.c generichash3.c hash.c hash3.c hash_sha3256.c \ hash_sha3512.c ipcrypt.c kdf.c kdf_hkdf.c kdf_hkdf2.c \ - kdf_hkdf3.c kdf_hkdf4.c kem_mlkem768.c kem_xwing.c keygen.c \ - kx.c metamorphic.c misuse.c onetimeauth.c onetimeauth2.c \ - onetimeauth7.c pwhash_argon2i.c pwhash_argon2id.c \ - pwhash_argon2id2.c pwhash_scrypt.c pwhash_scrypt_ll.c \ - randombytes.c scalarmult.c scalarmult2.c scalarmult5.c \ - scalarmult6.c scalarmult7.c scalarmult8.c scalarmult_ed25519.c \ - scalarmult_ristretto255.c secretbox.c secretbox2.c \ - secretbox7.c secretbox8.c secretbox_easy.c secretbox_easy2.c \ - secretstream_xchacha20poly1305.c shorthash.c sign.c \ - siphashx24.c sodium_core.c sodium_utils.c sodium_utils2.c \ - sodium_utils3.c sodium_utils4.c sodium_version.c stream.c \ - stream2.c stream3.c stream4.c stream5.c stream6.c verify1.c \ - xchacha20.c xof2.c xof_shake128.c xof_shake256.c \ - xof_turboshake128.c xof_turboshake256.c + kdf_hkdf3.c kdf_hkdf4.c kem.c kem_mlkem768.c kem_xwing.c \ + keygen.c kx.c metamorphic.c misuse.c onetimeauth.c \ + onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \ + pwhash_argon2id.c pwhash_argon2id2.c pwhash_scrypt.c \ + pwhash_scrypt_ll.c randombytes.c scalarmult.c scalarmult2.c \ + scalarmult5.c scalarmult6.c scalarmult7.c scalarmult8.c \ + scalarmult_ed25519.c scalarmult_ristretto255.c secretbox.c \ + secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \ + secretbox_easy2.c secretstream_xchacha20poly1305.c shorthash.c \ + sign.c siphashx24.c sodium_core.c sodium_utils.c \ + sodium_utils2.c sodium_utils3.c sodium_utils4.c \ + sodium_version.c stream.c stream2.c stream3.c stream4.c \ + stream5.c stream6.c verify1.c xchacha20.c xof2.c \ + xof_shake128.c xof_shake256.c xof_turboshake128.c \ + xof_turboshake256.c DIST_SOURCES = aead_aegis128l.c aead_aegis256.c aead_aes256gcm.c \ aead_aes256gcm2.c aead_chacha20poly1305.c \ aead_chacha20poly13052.c aead_xchacha20poly1305.c auth.c \ @@ -602,20 +608,21 @@ DIST_SOURCES = aead_aegis128l.c aead_aegis256.c aead_aes256gcm.c \ core_ristretto255.c ed25519_convert.c generichash.c \ generichash2.c generichash3.c hash.c hash3.c hash_sha3256.c \ hash_sha3512.c ipcrypt.c kdf.c kdf_hkdf.c kdf_hkdf2.c \ - kdf_hkdf3.c kdf_hkdf4.c kem_mlkem768.c kem_xwing.c keygen.c \ - kx.c metamorphic.c misuse.c onetimeauth.c onetimeauth2.c \ - onetimeauth7.c pwhash_argon2i.c pwhash_argon2id.c \ - pwhash_argon2id2.c pwhash_scrypt.c pwhash_scrypt_ll.c \ - randombytes.c scalarmult.c scalarmult2.c scalarmult5.c \ - scalarmult6.c scalarmult7.c scalarmult8.c scalarmult_ed25519.c \ - scalarmult_ristretto255.c secretbox.c secretbox2.c \ - secretbox7.c secretbox8.c secretbox_easy.c secretbox_easy2.c \ - secretstream_xchacha20poly1305.c shorthash.c sign.c \ - siphashx24.c sodium_core.c sodium_utils.c sodium_utils2.c \ - sodium_utils3.c sodium_utils4.c sodium_version.c stream.c \ - stream2.c stream3.c stream4.c stream5.c stream6.c verify1.c \ - xchacha20.c xof2.c xof_shake128.c xof_shake256.c \ - xof_turboshake128.c xof_turboshake256.c + kdf_hkdf3.c kdf_hkdf4.c kem.c kem_mlkem768.c kem_xwing.c \ + keygen.c kx.c metamorphic.c misuse.c onetimeauth.c \ + onetimeauth2.c onetimeauth7.c pwhash_argon2i.c \ + pwhash_argon2id.c pwhash_argon2id2.c pwhash_scrypt.c \ + pwhash_scrypt_ll.c randombytes.c scalarmult.c scalarmult2.c \ + scalarmult5.c scalarmult6.c scalarmult7.c scalarmult8.c \ + scalarmult_ed25519.c scalarmult_ristretto255.c secretbox.c \ + secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \ + secretbox_easy2.c secretstream_xchacha20poly1305.c shorthash.c \ + sign.c siphashx24.c sodium_core.c sodium_utils.c \ + sodium_utils2.c sodium_utils3.c sodium_utils4.c \ + sodium_version.c stream.c stream2.c stream3.c stream4.c \ + stream5.c stream6.c verify1.c xchacha20.c xof2.c \ + xof_shake128.c xof_shake256.c xof_turboshake128.c \ + xof_turboshake256.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1251,7 +1258,7 @@ TESTS_TARGETS = aead_aegis128l aead_aegis256 aead_aes256gcm \ codecs codecs2 codecs3 core_keccak1600 core1 core2 core3 core4 \ core5 core6 ed25519_convert generichash generichash2 \ generichash3 hash hash3 hash_sha3256 hash_sha3512 ipcrypt kdf \ - kem_mlkem768 kem_xwing keygen kx metamorphic misuse \ + kem kem_mlkem768 kem_xwing keygen kx metamorphic misuse \ onetimeauth onetimeauth2 onetimeauth7 pwhash_argon2i \ pwhash_argon2id pwhash_argon2id2 randombytes scalarmult \ scalarmult2 scalarmult5 scalarmult6 scalarmult7 scalarmult8 \ @@ -1696,6 +1703,10 @@ kdf_hkdf4$(EXEEXT): $(kdf_hkdf4_OBJECTS) $(kdf_hkdf4_DEPENDENCIES) $(EXTRA_kdf_h @rm -f kdf_hkdf4$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kdf_hkdf4_OBJECTS) $(kdf_hkdf4_LDADD) $(LIBS) +kem$(EXEEXT): $(kem_OBJECTS) $(kem_DEPENDENCIES) $(EXTRA_kem_DEPENDENCIES) + @rm -f kem$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(kem_OBJECTS) $(kem_LDADD) $(LIBS) + kem_mlkem768$(EXEEXT): $(kem_mlkem768_OBJECTS) $(kem_mlkem768_DEPENDENCIES) $(EXTRA_kem_mlkem768_DEPENDENCIES) @rm -f kem_mlkem768$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kem_mlkem768_OBJECTS) $(kem_mlkem768_LDADD) $(LIBS) @@ -1958,6 +1969,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdf_hkdf2.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdf_hkdf3.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdf_hkdf4.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kem.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kem_mlkem768.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kem_xwing.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keygen.Po@am__quote@ # am--include-marker @@ -2559,6 +2571,13 @@ kdf.log: kdf$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +kem.log: kem$(EXEEXT) + @p='kem$(EXEEXT)'; \ + b='kem'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) kem_mlkem768.log: kem_mlkem768$(EXEEXT) @p='kem_mlkem768$(EXEEXT)'; \ b='kem_mlkem768'; \ @@ -3107,6 +3126,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/kdf_hkdf2.Po -rm -f ./$(DEPDIR)/kdf_hkdf3.Po -rm -f ./$(DEPDIR)/kdf_hkdf4.Po + -rm -f ./$(DEPDIR)/kem.Po -rm -f ./$(DEPDIR)/kem_mlkem768.Po -rm -f ./$(DEPDIR)/kem_xwing.Po -rm -f ./$(DEPDIR)/keygen.Po @@ -3252,6 +3272,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/kdf_hkdf2.Po -rm -f ./$(DEPDIR)/kdf_hkdf3.Po -rm -f ./$(DEPDIR)/kdf_hkdf4.Po + -rm -f ./$(DEPDIR)/kem.Po -rm -f ./$(DEPDIR)/kem_mlkem768.Po -rm -f ./$(DEPDIR)/kem_xwing.Po -rm -f ./$(DEPDIR)/keygen.Po